Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add values for config map settings, including access log. #6797

Merged
merged 9 commits into from
Jul 3, 2018
Merged

Add values for config map settings, including access log. #6797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
06c0845
Add values for config map settings, including access log.
costinm Jul 2, 2018
2507b1d
Updates and improvements for the stress-testing configs.
costinm Jul 3, 2018
de53177
Merge branch 'master' of github.com:istio/istio into costin-install
costinm Jul 3, 2018
e3e277f
Address review comments
costinm Jul 3, 2018
8259d8c
Merged wrong files
costinm Jul 3, 2018
6c44c14
Add the setup helm file - this change now depend on the previous PR.
costinm Jul 3, 2018
11571ce
Merge branch 'master' of github.com:istio/istio into costin-install
costinm Jul 3, 2018
d6b96e5
Sync with remote, remove accidentally added files.
costinm Jul 3, 2018
28bfe53
Another accidental file
costinm Jul 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion install/kubernetes/helm/istio-remote/templates/sidecar-injector-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
istio: sidecar-injector
data:
config: |-
policy: {{ .Values.global.proxy.policy }}
policy: {{ .Values.global.proxy.autoInject }}
template: |-
initContainers:
- name: istio-init
Expand Down
4 changes: 3 additions & 1 deletion install/kubernetes/helm/istio-remote/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ global:
# Redirect only selected ports: --includeInboundPorts="80,8080"
includeInboundPorts: "*"
excludeInboundPorts: ""
policy: enabled

# This controls the 'policy' in the sidecar injector.
autoInject: enabled

# Sets the destination Statsd in envoy (the value of the "--statsdUdpAddress" proxy argument
# would be <host>:<port>).
Expand Down
13 changes: 0 additions & 13 deletions install/kubernetes/helm/istio/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,6 @@ data:
mixerReportServer: istio-telemetry.{{ .Release.Namespace }}.svc.cluster.local:15004
# This is the ingress service name, update if you used a different name
ingressService: istio-ingress
#
# Along with discoveryRefreshDelay, this setting determines how
# frequently should Envoy fetch and update its internal configuration
# from istio Pilot. Lower refresh delay results in higher CPU
# utilization and potential performance loss in exchange for faster
# convergence. Tweak this value according to your setup.
# Deprecated: using push.
rdsRefreshDelay: {{ .Values.global.refreshInterval }}

# Unix Domain Socket through which envoy communicates with NodeAgent SDS to get
# key/cert for mTLS. Use secret-mount files instead of SDS if set to empty.
Expand All @@ -45,11 +37,6 @@ data:

#
defaultConfig:
# NOTE: If you change any values in this section, make sure to make
# the same changes in start up args in istio-ingress pods.
# See rdsRefreshDelay for explanation about this setting.
# Deprecated: using push.
discoveryRefreshDelay: {{ .Values.global.refreshInterval }}
#
# TCP connection timeout between Envoy & the application, and between Envoys.
connectTimeout: 10s
Expand Down
2 changes: 1 addition & 1 deletion install/kubernetes/helm/istio/templates/sidecar-injector-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
istio: sidecar-injector
data:
config: |-
policy: {{ .Values.global.proxy.autoinject }}
policy: {{ .Values.global.proxy.autoInject }}
template: |-
initContainers:
- name: istio-init
Expand Down
4 changes: 1 addition & 3 deletions install/kubernetes/helm/istio/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@ global:
# Releases are published to docker hub under 'istio' project.
# Daily builds from prow are on gcr.io, and nightly builds from circle on
hub: docker.io/istionightly
#hub: docker.io/istio

# Default tag for Istio images.
tag: nightly-master
#tag: 1.0.latest

proxy:
image: proxyv2
Expand Down Expand Up @@ -42,7 +40,7 @@ global:
excludeInboundPorts: ""

# This controls the 'policy' in the sidecar injector.
autoinject: enabled
autoInject: enabled

# Sets the destination Statsd in envoy (the value of the "--statsdUdpAddress" proxy argument
# would be <host>:<port>).
Expand Down