Merge "SDN-C Multi-site High-availability - Auto-failover"

[oom.git] / kubernetes / consul / templates / deployment.yaml

diff --git a/kubernetes/consul/templates/deployment.yaml b/kubernetes/consul/templates/deployment.yaml
index 68b2391..2df4d2a 100644 (file)
--- a/kubernetes/consul/templates/deployment.yaml
+++ b/kubernetes/consul/templates/deployment.yaml
@@ -34,13 +34,25 @@ spec:
         release: {{ .Release.Name }}
       name: {{ include "common.name" . }}
     spec:
+      imagePullSecrets:
+      - name: "{{ include "common.namespace" . }}-docker-registry-key"
       containers:
-      - image: "{{ .Values.repository | default .Values.global.repository }}/{{ .Values.image }}"
-        command: ["/usr/local/bin/docker-entrypoint.sh"]
-        args: ["agent","-client","0.0.0.0","-enable-script-checks","-join","{{ .Release.Name }}-{{ index .Values "consul-server" "nameOverride" }}.{{ include "common.namespace" .}}"]
+      - image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+        command:
+        - /bin/sh
+        - "-c"
+        - |
+          apk update && apk add jq
+          cp /tmp/consul/config/* /consul/config
+          /usr/local/bin/docker-entrypoint.sh agent -client 0.0.0.0 -enable-script-checks -retry-join {{ .Values.consulServer.nameOverride }}
         name: {{ include "common.name" . }}
+        env:
+          - name: SDNC_ODL_COUNT
+            value: "{{ .Values.sdnc.replicaCount }}"
+          - name: SDNC_IS_PRIMARY_CLUSTER
+            value: "{{ .Values.sdnc.config.isPrimaryCluster }}"
         volumeMounts:
-        - mountPath: /consul/config
+        - mountPath: /tmp/consul/config
           name: consul-agent-config
         - mountPath: /consul/scripts
           name: consul-agent-scripts-config
@@ -57,4 +69,3 @@ spec:
       - secret:
           secretName: {{ include "common.fullname" . }}-certs-secret
         name: consul-agent-certs-config
-