| commit | 89577808e8a06a69a76140283d64adfd7fee917e | [log] [tgz] |
|---|---|---|
| author | Huabing Zhao <zhaohuabing@gmail.com> | Mon Jul 30 09:41:17 2018 +0000 |
| committer | Huabing Zhao <zhaohuabing@gmail.com> | Mon Jul 30 09:46:06 2018 +0000 |
| tree | c98c9df290fc49fddfe7d7883768e98981997d3a | |
| parent | d0379b11e1fb3f1734b8f0e119d780dec50e7718 [diff] |
Enable Istio sidecar injection for multicloud Issue-ID: MULTICLOUD-290 Change-Id: Ibd789e57fc1bc2ca0efeecf341880cea4a955cd0 Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>
diff --git a/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml index fa96466..110d7aa 100644 --- a/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml +++ b/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml
@@ -35,6 +35,8 @@ 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 dcaf37d..e837497 100644 --- a/kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml +++ b/kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml
@@ -38,13 +38,13 @@ 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" . }}