diff options
| author |   James MacNider <James.MacNider@amdocs.com> | 2019-04-12 17:58:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-12 17:58:03 +0000 |
| commit | 95840bfa23fb50bbcc8109a8a223ff2b247c6001 (patch) | |
| tree | 7b93e596b0a340ce026454d7d63320e166d97160 /kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml | |
| parent | c22ceb9913b31ad2738a1f1391b382352a5de67d (diff) | |
| parent | ecc9f60e3853fa4a15de3adb3b1823ec73f5b619 (diff) | |
Merge "Update image versions"
Diffstat (limited to 'kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml')
| -rw-r--r-- | kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml index 62eeb45281..d6c58cd75f 100644 --- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml +++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml @@ -34,6 +34,16 @@ spec: app: {{ include "common.name" . }} release: {{ .Release.Name }} spec: + initContainers: + - name: {{ include "common.name" . }}-multisite-init + image: {{ include "common.repository" . }}/{{ .Values.multisiteInitImage }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + args: + - --namespace + - {{ include "common.namespace" . }} + - --configmap + - {{ .Values.multisiteConfigMapName }} + restartPolicy: Never containers: - name: {{ include "common.name" . }} image: "{{ include "common.repository" . }}/{{ .Values.image }}" @@ -50,10 +60,11 @@ spec: port: {{ .Values.service.internalPort }} initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.liveness.periodSeconds }} - {{ end -}} + {{ end }} readinessProbe: - tcpSocket: - port: {{ .Values.service.internalPort }} + exec: + command: + - /scripts/readiness-check.sh initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} volumeMounts: @@ -61,6 +72,9 @@ spec: subPath: config.txt name: {{ include "common.fullname" .}}-config readOnly: true + - mountPath: /opt/onap/kube + name: {{ include "common.fullname" .}}-kubeconfig + readOnly: true - mountPath: /secret name: dcae-token readOnly: true @@ -78,6 +92,9 @@ spec: - name: {{ include "common.fullname" . }}-config configMap: name: {{ include "common.fullname" . }}-configmap + - name: {{ include "common.fullname" .}}-kubeconfig + configMap: + name: {{ .Values.multisiteConfigMapName }} - name: dcae-token secret: secretName: dcae-token |