Merge "MSB external api gateway service k8s deployment"

5 files changed, 49 insertions, 5 deletions

diff --git a/kubernetes/msb/templates/all-services.yaml b/kubernetes/msb/templates/all-services.yaml
index ea66c31350..80892fe728 100644
--- a/kubernetes/msb/templates/all-services.yaml
+++ b/kubernetes/msb/templates/all-services.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   clusterIP: "{{ .Values.consulClusterIP }}"
   ports:
-    - port: 8500
+    - port: {{ .Values.consulPort }}
       nodePort: "{{ .Values.consulNodePort }}"
   selector:
     app: msb-consul
diff --git a/kubernetes/msb/templates/msb-consul-deployment.yaml b/kubernetes/msb/templates/msb-consul-deployment.yaml
index 0d98896529..1dbbe8fb1b 100644
--- a/kubernetes/msb/templates/msb-consul-deployment.yaml
+++ b/kubernetes/msb/templates/msb-consul-deployment.yaml
@@ -19,11 +19,11 @@ spec:
         image: consul
         name: "msb-consul"
         ports:
-        - containerPort: 8500
+        - containerPort: {{ .Values.consulPort }}
           name: msb-consul
         readinessProbe:
           tcpSocket:
-            port: 8500
+            port: {{ .Values.consulPort }}
           initialDelaySeconds: 5
           periodSeconds: 10
         imagePullPolicy: "{{ .Values.pullPolicy }}"
\ 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 e4736b5a7a..a5d014aae4 100644
--- a/kubernetes/msb/templates/msb-discovery-deployment.yaml
+++ b/kubernetes/msb/templates/msb-discovery-deployment.yaml
@@ -22,11 +22,11 @@ spec:
         - name: CONSUL_IP
           value: "{{ .Values.consulClusterIP }}"
         ports:
-        - containerPort: 10081
+        - containerPort: {{ .Values.discoveryPort }}
           name: msb-discovery
         readinessProbe:
           tcpSocket:
-            port: 10081
+            port: {{ .Values.discoveryPort }}
           initialDelaySeconds: 5
           periodSeconds: 10
         imagePullPolicy: "{{ .Values.pullPolicy }}"
diff --git a/kubernetes/msb/templates/msb-eag-deployment.yaml b/kubernetes/msb/templates/msb-eag-deployment.yaml
new file mode 100644
index 0000000000..45b8879bb3
--- /dev/null
+++ b/kubernetes/msb/templates/msb-eag-deployment.yaml
@@ -0,0 +1,38 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: msb-eag
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app: msb-eag
+  template:
+    metadata:
+      labels:
+        app: msb-eag
+      name: msb-eag
+    spec:
+      hostname: msb-eag
+      containers:
+      - args:
+        image:  nexus3.onap.org:10001/onap/msb/msb_apigateway
+        name: "msb-eag"
+        env:
+        - name: CONSUL_IP
+          value: "{{ .Values.consulClusterIP}}"
+        - name: SDCLIENT_IP
+          value: "{{ .Values.discoveryClusterIP}}"
+        - name: ROUTE_LABELS
+          value: "visualRange:0"
+        ports:
+        - containerPort: {{ .Values.eagPort }}
+          name: msb-eag
+        readinessProbe:
+          tcpSocket:
+            port: {{ .Values.eagPort }}
+          initialDelaySeconds: 5
+          periodSeconds: 10
+        imagePullPolicy: "{{ .Values.pullPolicy}}"
+
+
diff --git a/kubernetes/msb/values.yaml b/kubernetes/msb/values.yaml
index eba6612689..8877000c91 100644
--- a/kubernetes/msb/values.yaml
+++ b/kubernetes/msb/values.yaml
@@ -1,5 +1,11 @@
 consulClusterIP: 10.43.6.204
 discoveryClusterIP: 10.43.6.205
+consulPort: 8500
 consulNodePort: 30500
+discoveryPort: 10081
 discoveryNodePort: 30081
+iagPort: 80
+iagNodePort: 30080
+eagPort: 80
+eagNodePort: 30082
 pullPolicy: IfNotPresent
\ No newline at end of file