Enable Istio sidecar injection

Change-Id: I0ec08fbbfa5e5949d7645493f7d1ce7237707a26
Issue-ID: MSB-226
Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>

diff --git a/kubernetes/msb/charts/kube2msb/values.yaml b/kubernetes/msb/charts/kube2msb/values.yaml
index 1d33450..d4ec088 100644 (file)
--- 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 74342e7..09a3d8f 100644 (file)
--- 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 0c7a508..b87cf85 100644 (file)
--- 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 aec03b0..967e0e9 100644 (file)
--- 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 3c690dd..c3f5fdf 100644 (file)
--- 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 26ee388..31bb2c9 100644 (file)
--- 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 451df8c..72522f3 100644 (file)
--- 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 26ee388..31bb2c9 100644 (file)
--- 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 3f397c3..20080cd 100644 (file)
--- 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: