From d0379b11e1fb3f1734b8f0e119d780dec50e7718 Mon Sep 17 00:00:00 2001
From: Huabing Zhao <zhaohuabing@gmail.com>
Date: Mon, 30 Jul 2018 07:35:08 +0000
Subject: [PATCH] Add protocol prefix to port names

Protocol prefix needs to be added to prot name in order to leverage the Istio features.

Issue-ID: MSB-226
Change-Id: I670d6abbb2321b25aa30166b7d5415acaaf3e971
Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>
---
 kubernetes/msb/charts/msb-consul/templates/service.yaml    | 4 ++--
 kubernetes/msb/charts/msb-discovery/templates/service.yaml | 4 ++--
 kubernetes/msb/charts/msb-eag/templates/service.yaml       | 8 ++++----
 kubernetes/msb/charts/msb-iag/templates/service.yaml       | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/kubernetes/msb/charts/msb-consul/templates/service.yaml b/kubernetes/msb/charts/msb-consul/templates/service.yaml
index 86442a2740..9a7029d21f 100644
--- a/kubernetes/msb/charts/msb-consul/templates/service.yaml
+++ b/kubernetes/msb/charts/msb-consul/templates/service.yaml
@@ -15,11 +15,11 @@ spec:
     {{if eq .Values.service.type "NodePort" -}}
     - port: {{ .Values.service.externalPort }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
-      name: {{ .Values.service.name }}
+      name: http-{{ .Values.service.name }}
     {{- 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/msb/charts/msb-discovery/templates/service.yaml b/kubernetes/msb/charts/msb-discovery/templates/service.yaml
index 86442a2740..9a7029d21f 100644
--- a/kubernetes/msb/charts/msb-discovery/templates/service.yaml
+++ b/kubernetes/msb/charts/msb-discovery/templates/service.yaml
@@ -15,11 +15,11 @@ spec:
     {{if eq .Values.service.type "NodePort" -}}
     - port: {{ .Values.service.externalPort }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
-      name: {{ .Values.service.name }}
+      name: http-{{ .Values.service.name }}
     {{- 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/msb/charts/msb-eag/templates/service.yaml b/kubernetes/msb/charts/msb-eag/templates/service.yaml
index 3e4a786cb8..5c7d83049b 100644
--- a/kubernetes/msb/charts/msb-eag/templates/service.yaml
+++ b/kubernetes/msb/charts/msb-eag/templates/service.yaml
@@ -15,17 +15,17 @@ spec:
     {{if eq .Values.service.type "NodePort" -}}
     - port: {{ .Values.service.externalPort }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
-      name: {{ .Values.service.name }}
+      name: http-{{ .Values.service.name }}
     - port: {{ .Values.service.externalPortHttps }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePortHttps }}
-      name: {{ .Values.service.name }}-https
+      name: https-{{ .Values.service.name }}
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
-      name: {{ .Values.service.name }}
+      name: http-{{ .Values.service.name }}
     - port: {{ .Values.service.externalPortHttps }}
       targetPort: {{ .Values.service.internalPortHttps }}
-      name: {{ .Values.service.name }}-https
+      name: https-{{ .Values.service.name }}
     {{- end}}
   selector:
     app: {{ include "common.name" . }}
diff --git a/kubernetes/msb/charts/msb-iag/templates/service.yaml b/kubernetes/msb/charts/msb-iag/templates/service.yaml
index 3e4a786cb8..5c7d83049b 100644
--- a/kubernetes/msb/charts/msb-iag/templates/service.yaml
+++ b/kubernetes/msb/charts/msb-iag/templates/service.yaml
@@ -15,17 +15,17 @@ spec:
     {{if eq .Values.service.type "NodePort" -}}
     - port: {{ .Values.service.externalPort }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
-      name: {{ .Values.service.name }}
+      name: http-{{ .Values.service.name }}
     - port: {{ .Values.service.externalPortHttps }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePortHttps }}
-      name: {{ .Values.service.name }}-https
+      name: https-{{ .Values.service.name }}
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
-      name: {{ .Values.service.name }}
+      name: http-{{ .Values.service.name }}
     - port: {{ .Values.service.externalPortHttps }}
       targetPort: {{ .Values.service.internalPortHttps }}
-      name: {{ .Values.service.name }}-https
+      name: https-{{ .Values.service.name }}
     {{- end}}
   selector:
     app: {{ include "common.name" . }}
-- 
2.16.6