diff options
| author |   Huabing Zhao <zhaohuabing@gmail.com> | 2018-07-30 06:33:03 +0000 |
|---|---|---|
| committer | Huabing Zhao <zhaohuabing@gmail.com> | 2018-07-30 06:44:57 +0000 |
| commit | 81b8976007acce829ac5d4419319c35d4dbdadf1 (patch) | |
| tree | 10c9871f949769a4b17db610b8b6ec0c1d1f0873 /kubernetes/msb | |
| parent | c07edcbcacb435b7d6fced04af3f67e2e9eeadc0 (diff) | |
Enable Istio sidecar injection
Change-Id: I0ec08fbbfa5e5949d7645493f7d1ce7237707a26
Issue-ID: MSB-226
Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>
Diffstat (limited to 'kubernetes/msb')
9 files changed, 13 insertions, 0 deletions
diff --git a/kubernetes/msb/charts/kube2msb/values.yaml b/kubernetes/msb/charts/kube2msb/values.yaml index 1d334508bf..d4ec088970 100644 --- a/kubernetes/msb/charts/kube2msb/values.yaml +++ b/kubernetes/msb/charts/kube2msb/values.yaml @@ -13,6 +13,7 @@ global: repository: nexus3.onap.org:10001 image: onap/oom/kube2msb:1.1.0 pullPolicy: Always +istioSidecar: false # application configuration config: diff --git a/kubernetes/msb/charts/msb-consul/templates/deployment.yaml b/kubernetes/msb/charts/msb-consul/templates/deployment.yaml index 74342e7e0c..09a3d8f470 100644 --- a/kubernetes/msb/charts/msb-consul/templates/deployment.yaml +++ b/kubernetes/msb/charts/msb-consul/templates/deployment.yaml @@ -15,6 +15,8 @@ spec: labels: app: {{ include "common.name" . }} release: {{ .Release.Name }} + annotations: + sidecar.istio.io/inject: "{{.Values.istioSidecar}}" spec: containers: - name: {{ include "common.name" . }} diff --git a/kubernetes/msb/charts/msb-consul/values.yaml b/kubernetes/msb/charts/msb-consul/values.yaml index 0c7a508dc4..b87cf8528a 100644 --- a/kubernetes/msb/charts/msb-consul/values.yaml +++ b/kubernetes/msb/charts/msb-consul/values.yaml @@ -11,6 +11,7 @@ global: dockerHubRepository: registry.hub.docker.com image: library/consul:0.9.3 pullPolicy: Always +istioSidecar: true # application configuration config: {} diff --git a/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml b/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml index aec03b0b3f..967e0e9bb7 100644 --- a/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml +++ b/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml @@ -15,6 +15,8 @@ spec: labels: app: {{ include "common.name" . }} release: {{ .Release.Name }} + annotations: + sidecar.istio.io/inject: "{{.Values.istioSidecar}}" spec: initContainers: - command: diff --git a/kubernetes/msb/charts/msb-discovery/values.yaml b/kubernetes/msb/charts/msb-discovery/values.yaml index 3c690ddef5..c3f5fdfad6 100644 --- a/kubernetes/msb/charts/msb-discovery/values.yaml +++ b/kubernetes/msb/charts/msb-discovery/values.yaml @@ -13,6 +13,7 @@ global: repository: nexus3.onap.org:10001 image: onap/msb/msb_discovery:1.1.0 pullPolicy: Always +istioSidecar: true # application configuration config: {} diff --git a/kubernetes/msb/charts/msb-eag/templates/deployment.yaml b/kubernetes/msb/charts/msb-eag/templates/deployment.yaml index 26ee3889c1..31bb2c96c8 100644 --- a/kubernetes/msb/charts/msb-eag/templates/deployment.yaml +++ b/kubernetes/msb/charts/msb-eag/templates/deployment.yaml @@ -15,6 +15,8 @@ spec: labels: app: {{ include "common.name" . }} release: {{ .Release.Name }} + annotations: + sidecar.istio.io/inject: "{{.Values.istioSidecar}}" spec: initContainers: - command: diff --git a/kubernetes/msb/charts/msb-eag/values.yaml b/kubernetes/msb/charts/msb-eag/values.yaml index 451df8cfee..72522f3475 100644 --- a/kubernetes/msb/charts/msb-eag/values.yaml +++ b/kubernetes/msb/charts/msb-eag/values.yaml @@ -13,6 +13,7 @@ global: repository: nexus3.onap.org:10001 image: onap/msb/msb_apigateway:1.1.0 pullPolicy: Always +istioSidecar: true # application configuration config: diff --git a/kubernetes/msb/charts/msb-iag/templates/deployment.yaml b/kubernetes/msb/charts/msb-iag/templates/deployment.yaml index 26ee3889c1..31bb2c96c8 100644 --- a/kubernetes/msb/charts/msb-iag/templates/deployment.yaml +++ b/kubernetes/msb/charts/msb-iag/templates/deployment.yaml @@ -15,6 +15,8 @@ spec: labels: app: {{ include "common.name" . }} release: {{ .Release.Name }} + annotations: + sidecar.istio.io/inject: "{{.Values.istioSidecar}}" spec: initContainers: - command: diff --git a/kubernetes/msb/charts/msb-iag/values.yaml b/kubernetes/msb/charts/msb-iag/values.yaml index 3f397c3250..20080cddf3 100644 --- a/kubernetes/msb/charts/msb-iag/values.yaml +++ b/kubernetes/msb/charts/msb-iag/values.yaml @@ -13,6 +13,7 @@ global: repository: nexus3.onap.org:10001 image: onap/msb/msb_apigateway:1.1.0 pullPolicy: Always +istioSidecar: true # application configuration config: |