Run all components in one namespace

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

diff --git a/kubernetes/msb/templates/msb-discovery-deployment.yaml b/kubernetes/msb/templates/msb-discovery-deployment.yaml
index 0fcd2f9..280e6c3 100644 (file)
--- a/kubernetes/msb/templates/msb-discovery-deployment.yaml
+++ b/kubernetes/msb/templates/msb-discovery-deployment.yaml
@@ -1,7 +1,9 @@
+#{{ if not .Values.disableMsbMsbDiscovery }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: msb-discovery
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.discoveryReplicas }}
   selector:
@@ -14,13 +16,28 @@ spec:
       name: msb-discovery
     spec:
       hostname: msb-discovery
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - msb-consul
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: {{ .Values.image.readiness }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: msb-discovery-readiness
       containers:
       - args:
-        image:  nexus3.onap.org:10001/onap/msb/msb_discovery
+        image:  {{ .Values.image.discovery }}
         name: "msb-discovery"
         env:
         - name: CONSUL_IP
-          value: "{{ .Values.consulClusterIP }}"
+          value: msb-consul.{{ .Values.nsPrefix }}
         ports:
         - containerPort: {{ .Values.discoveryPort }}
           name: msb-discovery
@@ -29,6 +46,7 @@ spec:
             port: {{ .Values.discoveryPort }}
           initialDelaySeconds: 5
           periodSeconds: 10
-        imagePullPolicy: "{{ .Values.pullPolicy }}"
-
-
+        imagePullPolicy: {{ .Values.pullPolicy }}
+      imagePullSecrets:
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}