Skip to content

Commit

Permalink
Mixer grammar (istio#12721)
Browse files Browse the repository at this point in the history
* consistency of Mixer references

* consistency of Mixer references

Signed-off-by: Lee Calcote <[email protected]>
  • Loading branch information
leecalcote authored and istio-testing committed Aug 28, 2019
1 parent 7442bcc commit 836395c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions install/kubernetes/helm/istio/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ metadata:
release: {{ .Release.Name }}
data:
mesh: |-
# Set the following variable to true to disable policy checks by the Mixer.
# Note that metrics will still be reported to the Mixer.
# Set the following variable to true to disable policy checks by Mixer.
# Note that metrics will still be reported to Mixer.
{{- if .Values.mixer.policy.enabled }}
disablePolicyChecks: {{ .Values.global.disablePolicyChecks }}
{{- else }}
Expand Down
6 changes: 3 additions & 3 deletions istioctl/cmd/testdata/mesh-config.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Set the following variable to true to disable policy checks by the Mixer.
# Note that metrics will still be reported to the Mixer.
# Set the following variable to true to disable policy checks by Mixer.
# Note that metrics will still be reported to Mixer.
disablePolicyChecks: false
# Set enableTracing to false to disable request tracing.
enableTracing: true
#
# To disable the mixer completely (including metrics), comment out
# To disable Mixer completely (including metrics), comment out
# the following lines
mixerCheckServer: istio-policy.istio-system.svc.cluster.local:15004
mixerReportServer: istio-telemetry.istio-system.svc.cluster.local:15004
Expand Down

0 comments on commit 836395c

Please sign in to comment.