From 89577808e8a06a69a76140283d64adfd7fee917e Mon Sep 17 00:00:00 2001
From: Huabing Zhao <zhaohuabing@gmail.com>
Date: Mon, 30 Jul 2018 09:41:17 +0000
Subject: Enable Istio sidecar injection for multicloud

Issue-ID: MULTICLOUD-290
Change-Id: Ibd789e57fc1bc2ca0efeecf341880cea4a955cd0
Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>
---
 .../multicloud/charts/multicloud-ocata/templates/deployment.yaml      | 2 ++
 kubernetes/multicloud/charts/multicloud-ocata/templates/service.yaml  | 4 ++--
 kubernetes/multicloud/charts/multicloud-ocata/values.yaml             | 3 +++
 kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml | 2 ++
 kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml    | 4 ++--
 kubernetes/multicloud/charts/multicloud-vio/values.yaml               | 3 +++
 .../multicloud/charts/multicloud-windriver/templates/deployment.yaml  | 2 ++
 .../multicloud/charts/multicloud-windriver/templates/service.yaml     | 4 ++--
 kubernetes/multicloud/charts/multicloud-windriver/values.yaml         | 3 +++
 kubernetes/multicloud/values.yaml                                     | 3 +++
 10 files changed, 24 insertions(+), 6 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
diff --git a/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml
index fa9646657b..110d7aab46 100644
--- a/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-vio/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-vio/templates/service.yaml b/kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml
index dcaf37d192..e8374970bb 100644
--- a/kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml
+++ b/kubernetes/multicloud/charts/multicloud-vio/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-vio/values.yaml b/kubernetes/multicloud/charts/multicloud-vio/values.yaml
index 03f9cc584b..a660e993ef 100644
--- a/kubernetes/multicloud/charts/multicloud-vio/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-vio/values.yaml
@@ -26,6 +26,9 @@ repository: nexus3.onap.org:10001
 image: onap/multicloud/vio:1.1.2
 pullPolicy: Always
 
+#Istio sidecar injection policy
+istioSidecar: true 
+
 # application configuration
 config:
   msbgateway: msb-iag
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
index 62857f6664..a48e1e19d2 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-windriver/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-windriver/templates/service.yaml b/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml
index dd3bd4214f..276d46f2d9 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml
+++ b/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml
@@ -39,13 +39,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-windriver/values.yaml b/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
index 41d3b7f6bf..1286cbdd0f 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
@@ -26,6 +26,9 @@ repository: nexus3.onap.org:10001
 image: onap/multicloud/openstack-windriver:1.1.2
 pullPolicy: Always
 
+#Istio sidecar injection policy
+istioSidecar: true
+
 # application configuration
 config:
   msbgateway: msb-iag
diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index d909914b55..8216962b2a 100644
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -28,6 +28,9 @@ repository: nexus3.onap.org:10001
 image: onap/multicloud/framework:1.1.2
 pullPolicy: Always
 
+#Istio sidecar injection policy
+istioSidecar: true
+
 # application configuration
 config:
   msbgateway: msb-iag
-- 
cgit 1.2.3-korg