summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorrui hu <hu.rui2@zte.com.cn>2018-08-04 02:06:04 +0000
committerGerrit Code Review <gerrit@onap.org>2018-08-04 02:06:04 +0000
commit2e1285bba8596f5e3a7a1d79ea79219fc9721030 (patch)
tree23763005ca0164e496464421bef717508e73fd46 /kubernetes
parent08d21a6ca52580338c7d1eda328870e831c8d61c (diff)
parent408a87d4f67b554bf18cd05ca816ae486567a651 (diff)
Merge "Enable sidecar for kube2msb"
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/msb/charts/kube2msb/templates/deployment.yaml2
-rw-r--r--kubernetes/msb/charts/kube2msb/values.yaml2
-rw-r--r--kubernetes/msb/charts/msb-consul/values.yaml2
3 files changed, 4 insertions, 2 deletions
diff --git a/kubernetes/msb/charts/kube2msb/templates/deployment.yaml b/kubernetes/msb/charts/kube2msb/templates/deployment.yaml
index 431387158d..c9911eb036 100644
--- a/kubernetes/msb/charts/kube2msb/templates/deployment.yaml
+++ b/kubernetes/msb/charts/kube2msb/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/kube2msb/values.yaml b/kubernetes/msb/charts/kube2msb/values.yaml
index d4ec088970..9ef85e52b5 100644
--- a/kubernetes/msb/charts/kube2msb/values.yaml
+++ b/kubernetes/msb/charts/kube2msb/values.yaml
@@ -13,7 +13,7 @@ global:
repository: nexus3.onap.org:10001
image: onap/oom/kube2msb:1.1.0
pullPolicy: Always
-istioSidecar: false
+istioSidecar: true
# application configuration
config:
diff --git a/kubernetes/msb/charts/msb-consul/values.yaml b/kubernetes/msb/charts/msb-consul/values.yaml
index 80b86bf82c..b87cf8528a 100644
--- a/kubernetes/msb/charts/msb-consul/values.yaml
+++ b/kubernetes/msb/charts/msb-consul/values.yaml
@@ -11,7 +11,7 @@ global:
dockerHubRepository: registry.hub.docker.com
image: library/consul:0.9.3
pullPolicy: Always
-istioSidecar: false
+istioSidecar: true
# application configuration
config: {}