diff options
| author |   Jack Lucas <jflucas@research.att.com> | 2019-03-19 11:38:42 -0400 |
|---|---|---|
| committer | Jack Lucas <jflucas@research.att.com> | 2019-04-10 12:16:25 -0400 |
| commit | ecc9f60e3853fa4a15de3adb3b1823ec73f5b619 (patch) | |
| tree | 4e9dff06d36c6631b36bc2900137f908aae52d3f /kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates | |
| parent | b7d77b29e6bf22441b9fa20a61e7bedcc703e394 (diff) | |
Update image versions
Add setup for initial multisite kubeconfig.
Issue-ID: DCAEGEN2-1337
Issue-ID: DCAEGEN2-1136
Change-Id: I31a73faca05599cf702b99b5919fb0747cd483d2
Signed-off-by: Jack Lucas <jflucas@research.att.com>
Diffstat (limited to 'kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates')
| -rw-r--r-- | kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/configmap.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml | 23 |
2 files changed, 26 insertions, 3 deletions
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/configmap.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/configmap.yaml index 97728fae1d..b8dadaae89 100644 --- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/configmap.yaml +++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/configmap.yaml @@ -31,6 +31,12 @@ metadata: namespace: {{include "common.namespace" . }} data: {{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ .Values.multisiteConfigMapName }} + namespace: {{include "common.namespace" . }} {{ if .Values.dcae_ns }} --- apiVersion: v1 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 |