Skip to content

Commit

Permalink
Improve locality lb helm setting and enable by default (istio#15910)
Browse files Browse the repository at this point in the history
Previously, we intended for locality LB to be enabled by default, but it
actually wasn't. There is no clear way for the user to enable it either
without setting explicit failover or distribute.

In general helm api has been using the foo.enabled=true pattern, and we
can use this here. The meshconfig does NOT need to use the enabled flag.
  • Loading branch information
howardjohn authored and istio-testing committed Jul 30, 2019
1 parent 7d93cb2 commit ba9182f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion install/kubernetes/helm/istio/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ data:
outboundTrafficPolicy:
mode: {{ .Values.global.outboundTrafficPolicy.mode }}
{{- if .Values.global.localityLbSetting }}
{{- if .Values.global.localityLbSetting.enabled }}
localityLbSetting:
{{ toYaml .Values.global.localityLbSetting | indent 6 }}
{{- end }}
Expand Down
8 changes: 6 additions & 2 deletions install/kubernetes/helm/istio/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -484,22 +484,26 @@ global:
# Specifies the global locality load balancing settings.
# Locality-weighted load balancing allows administrators to control the distribution of traffic to
# endpoints based on the localities of where the traffic originates and where it will terminate.
# Please set either failover or distribute configuration but not both.
# Either failover or distribute configuration can be set, but not both. If neither are provided
# failover mode will be used.
#
# localityLbSetting:
# enabled: true
# distribute:
# - from: "us-central1/*"
# to:
# "us-central1/*": 80
# "us-central2/*": 20
#
# localityLbSetting:
# enabled: true
# failover:
# - from: us-east
# to: eu-west
# - from: us-west
# to: us-east
localityLbSetting: {}
localityLbSetting:
enabled: true

# Specifies whether helm test is enabled or not.
# This field is set to false by default, so 'helm template ...'
Expand Down

0 comments on commit ba9182f

Please sign in to comment.