Run all components in one namespace

[oom.git] / kubernetes / msb / templates / msb-eag-deployment.yaml

diff --git a/kubernetes/msb/templates/msb-eag-deployment.yaml b/kubernetes/msb/templates/msb-eag-deployment.yaml
index eb60fe2..a24b3b0 100644 (file)
--- a/kubernetes/msb/templates/msb-eag-deployment.yaml
+++ b/kubernetes/msb/templates/msb-eag-deployment.yaml
@@ -1,8 +1,9 @@
+#{{ if not .Values.disableMsbMsbEag }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: msb-eag
-  namespace: "{{ .Values.nsPrefix }}-msb"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.eagReplicas }}
   selector:
@@ -15,15 +16,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:  {{ .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:
@@ -35,5 +51,6 @@ spec:
           initialDelaySeconds: 5
           periodSeconds: 10
         imagePullPolicy: {{ .Values.pullPolicy}}
-
-
+      imagePullSecrets:
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}