Use domain name instead of IP for consul

Issue-Id: OOM-113
Change-Id: I41e6f72337a15c1d07b444b09171204d8eb378ec
Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>

5 files changed, 28 insertions, 33 deletions

diff --git a/kubernetes/msb/templates/all-services.yaml b/kubernetes/msb/templates/all-services.yaml
index 4ec4656896..aeb4f5e9b0 100644
--- a/kubernetes/msb/templates/all-services.yaml
+++ b/kubernetes/msb/templates/all-services.yaml
@@ -6,7 +6,6 @@ metadata:
   labels:
     app: msb-consul
 spec:
-  clusterIP: "{{ .Values.consulClusterIP }}"
   ports:
     - port: {{ .Values.consulPort }}
       nodePort: {{ .Values.consulNodePort }}
@@ -35,29 +34,27 @@ kind: Service
 metadata:
   name: msb-iag
   namespace: "{{ .Values.nsPrefix }}-msb"
-  labels:
-    app: msb-iag
-spec:
-  clusterIP: "{{ .Values.iagClusterIP }}"
-  ports:
-    - port: {{ .Values.iagPort }}
-      nodePort: {{ .Values.iagNodePort }}
-  selector:
-    app: msb-iag
-  type: NodePort
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: msb-eag
-  namespace: "{{ .Values.nsPrefix }}-msb"
-  labels:
-    app: msb-eag
-spec:
-  clusterIP: "{{ .Values.eagClusterIP }}"
-  ports:
-    - port: {{ .Values.eagPort }}
-      nodePort: {{ .Values.eagNodePort }}
-  selector:
-    app: msb-eag
-  type: NodePort
\ No newline at end of file
+    labels:
+      app: msb-iag
+  spec:
+    ports:
+      - port: {{ .Values.iagPort }}
+        nodePort: {{ .Values.iagNodePort }}
+    selector:
+      app: msb-iag
+    type: NodePort
+  ---
+  apiVersion: v1
+  kind: Service
+  metadata:
+    name: msb-eag
+    namespace: "{{ .Values.nsPrefix }}-msb"
+    labels:
+      app: msb-eag
+  spec:
+    ports:
+      - port: {{ .Values.eagPort }}
+        nodePort: {{ .Values.eagNodePort }}
+    selector:
+      app: msb-eag
+    type: NodePort
\ No newline at end of file
diff --git a/kubernetes/msb/templates/msb-discovery-deployment.yaml b/kubernetes/msb/templates/msb-discovery-deployment.yaml
index 24cb3a5f8c..3af9e8f858 100644
--- a/kubernetes/msb/templates/msb-discovery-deployment.yaml
+++ b/kubernetes/msb/templates/msb-discovery-deployment.yaml
@@ -21,7 +21,7 @@ spec:
         name: "msb-discovery"
         env:
         - name: CONSUL_IP
-          value: "{{ .Values.consulClusterIP }}"
+          value: msb-consul.{{ .Values.nsPrefix }}-msb
         ports:
         - containerPort: {{ .Values.discoveryPort }}
           name: msb-discovery
diff --git a/kubernetes/msb/templates/msb-eag-deployment.yaml b/kubernetes/msb/templates/msb-eag-deployment.yaml
index d1c20ad6dc..db703d9188 100644
--- a/kubernetes/msb/templates/msb-eag-deployment.yaml
+++ b/kubernetes/msb/templates/msb-eag-deployment.yaml
@@ -21,7 +21,7 @@ spec:
         name: "msb-eag"
         env:
         - name: CONSUL_IP
-          value: "{{ .Values.consulClusterIP}}"
+          value:  msb-consul.{{ .Values.nsPrefix }}-msb
         - name: SDCLIENT_IP
           value: "{{ .Values.discoveryClusterIP}}"
         - name: ROUTE_LABELS
diff --git a/kubernetes/msb/templates/msb-iag-deployment.yaml b/kubernetes/msb/templates/msb-iag-deployment.yaml
index 3ab9f9a2b9..3f82e33a72 100644
--- a/kubernetes/msb/templates/msb-iag-deployment.yaml
+++ b/kubernetes/msb/templates/msb-iag-deployment.yaml
@@ -21,7 +21,7 @@ spec:
         name: "msb-iag"
         env:
         - name: CONSUL_IP
-          value: "{{ .Values.consulClusterIP}}"
+          value: msb-consul.{{ .Values.nsPrefix }}-msb
         - name: SDCLIENT_IP
           value: "{{ .Values.discoveryClusterIP}}"
         - name: ROUTE_LABELS
diff --git a/kubernetes/msb/values.yaml b/kubernetes/msb/values.yaml
index 6927f1da6e..01f1696adc 100644
--- a/kubernetes/msb/values.yaml
+++ b/kubernetes/msb/values.yaml
@@ -5,21 +5,19 @@ image:
   discovery: nexus3.onap.org:10001/onap/msb/msb_discovery:latest
   apigateway: nexus3.onap.org:10001/onap/msb/msb_discovery:latest
 
-consulClusterIP: 10.43.6.204
 consulPort: 8500
 consulNodePort: 30500
 
+# Should remove cluster IP after domain name is supported by API gateway
 discoveryClusterIP: 10.43.6.205
 discoveryPort: 10081
 discoveryNodePort: 30081
 discoveryReplicas: 1
 
-iagClusterIP: 10.43.6.206
 iagPort: 80
 iagNodePort: 30080
 iagReplicas: 1
 
-eagClusterIP: 10.43.6.207
 eagPort: 80
 eagNodePort: 30082
 eagReplicas: 1
\ No newline at end of file