X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fmsb%2Ftemplates%2Fmsb-eag-deployment.yaml;h=dd253fce4d9a0cf32cd67a04cedd958d0610b275;hb=e04b2feb855e5ab20e28c867d2bd7f89f6b8c425;hp=eb75cd9e42de7289e08786e375ed88dc72fe01a5;hpb=f09fd2aa508f8bcf8fda023d6d70ccb20dbf447e;p=oom.git

diff --git a/kubernetes/msb/templates/msb-eag-deployment.yaml b/kubernetes/msb/templates/msb-eag-deployment.yaml
index eb75cd9e42..dd253fce4d 100644
--- a/kubernetes/msb/templates/msb-eag-deployment.yaml
+++ b/kubernetes/msb/templates/msb-eag-deployment.yaml
@@ -1,7 +1,23 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#{{ if not .Values.disableMsbMsbEag }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: msb-eag
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.eagReplicas }}
   selector:
@@ -14,15 +30,30 @@ spec:
       name: msb-eag
     spec:
       hostname: msb-eag
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - msb-discovery
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: {{ .Values.image.readiness }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: msb-eag-readiness
       containers:
       - args:
-        image:  nexus3.onap.org:10001/onap/msb/msb_apigateway
+        image:  {{ .Values.image.apigateway }}
         name: "msb-eag"
         env:
         - name: CONSUL_IP
-          value: "{{ .Values.consulClusterIP}}"
+          value:  msb-consul.{{ .Values.nsPrefix }}
         - name: SDCLIENT_IP
-          value: "{{ .Values.discoveryClusterIP}}"
+          value:  msb-discovery.{{ .Values.nsPrefix }}
         - name: ROUTE_LABELS
           value: "visualRange:0"
         ports:
@@ -33,6 +64,7 @@ spec:
             port: {{ .Values.eagPort }}
           initialDelaySeconds: 5
           periodSeconds: 10
-        imagePullPolicy: "{{ .Values.pullPolicy}}"
-
-
+        imagePullPolicy: {{ .Values.pullPolicy}}
+      imagePullSecrets:
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}