summaryrefslogtreecommitdiffstats
path: root/kubernetes/multicloud/charts/multicloud-ocata
diff options
context:
space:
mode:
authorHuabing Zhao <zhaohuabing@gmail.com>2018-07-30 09:41:17 +0000
committerHuabing Zhao <zhaohuabing@gmail.com>2018-07-30 09:46:06 +0000
commit89577808e8a06a69a76140283d64adfd7fee917e (patch)
treec98c9df290fc49fddfe7d7883768e98981997d3a /kubernetes/multicloud/charts/multicloud-ocata
parentd0379b11e1fb3f1734b8f0e119d780dec50e7718 (diff)
Enable Istio sidecar injection for multicloud
Issue-ID: MULTICLOUD-290 Change-Id: Ibd789e57fc1bc2ca0efeecf341880cea4a955cd0 Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>
Diffstat (limited to 'kubernetes/multicloud/charts/multicloud-ocata')
-rw-r--r--kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-ocata/templates/service.yaml4
-rw-r--r--kubernetes/multicloud/charts/multicloud-ocata/values.yaml3
3 files changed, 7 insertions, 2 deletions
diff --git a/kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml
index 0106a79973..0f8335ec31 100644
--- a/kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml
@@ -35,6 +35,8 @@ spec:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
name: {{ include "common.name" . }}
+ annotations:
+ sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
spec:
containers:
- env:
diff --git a/kubernetes/multicloud/charts/multicloud-ocata/templates/service.yaml b/kubernetes/multicloud/charts/multicloud-ocata/templates/service.yaml
index f47383e0db..b01f37ed98 100644
--- a/kubernetes/multicloud/charts/multicloud-ocata/templates/service.yaml
+++ b/kubernetes/multicloud/charts/multicloud-ocata/templates/service.yaml
@@ -38,13 +38,13 @@ metadata:
spec:
ports:
{{if eq .Values.service.type "NodePort" -}}
- - name: {{ .Values.service.name }}
+ - name: http-{{ .Values.service.name }}
port: {{ .Values.service.externalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: http-{{ .Values.service.name }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/multicloud/charts/multicloud-ocata/values.yaml b/kubernetes/multicloud/charts/multicloud-ocata/values.yaml
index 5534ee03aa..5011061f9a 100644
--- a/kubernetes/multicloud/charts/multicloud-ocata/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-ocata/values.yaml
@@ -26,6 +26,9 @@ repository: nexus3.onap.org:10001
image: onap/multicloud/openstack-ocata:1.1.2
pullPolicy: Always
+#Istio sidecar injection policy
+istioSidecar: true
+
# application configuration
config:
msbgateway: msb-iag