diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-09-04 16:34:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-09-04 16:34:04 +0000 |
| commit | df232875fb10b77e74ef00df5d248a9628577979 (patch) | |
| tree | 73ddf167e3e2bed6411cd103c689eaec6de051ab /kubernetes/common/network-name-gen | |
| parent | df63472f4a01598dc71b7e8a458726c8590d8b41 (diff) | |
| parent | 1694e1d1f6ea1af001ed651609cc66b35a0ac4e4 (diff) | |
Merge "[GENERAL] Use readiness container v3.0.1"
Diffstat (limited to 'kubernetes/common/network-name-gen')
| -rw-r--r-- | kubernetes/common/network-name-gen/templates/deployment.yaml | 13 | ||||
| -rw-r--r-- | kubernetes/common/network-name-gen/values.yaml | 3 |
2 files changed, 6 insertions, 10 deletions
diff --git a/kubernetes/common/network-name-gen/templates/deployment.yaml b/kubernetes/common/network-name-gen/templates/deployment.yaml index 87dd622c35..c97c0488ac 100644 --- a/kubernetes/common/network-name-gen/templates/deployment.yaml +++ b/kubernetes/common/network-name-gen/templates/deployment.yaml @@ -36,16 +36,14 @@ spec: release: {{ include "common.release" . }} spec: initContainers: -{{- if .Values.global.mariadbGalera.localCluster }} - - command: - - /root/ready.py + - name: {{ include "common.name" . }}-readiness + command: + - /app/ready.py args: +{{- if .Values.global.mariadbGalera.localCluster }} - --container-name - {{ index .Values "mariadb-galera" "nameOverride" }} {{- else }} - - command: - - /root/job_complete.py - args: - --job-name - {{ include "common.release" . }}-{{ index .Values "mariadb-init" "nameOverride" }}-config-job {{- end }} @@ -55,9 +53,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} command: diff --git a/kubernetes/common/network-name-gen/values.yaml b/kubernetes/common/network-name-gen/values.yaml index 81c596c6c9..cfa7171a7d 100644 --- a/kubernetes/common/network-name-gen/values.yaml +++ b/kubernetes/common/network-name-gen/values.yaml @@ -26,8 +26,7 @@ global: # readiness check - readinessRepository: oomk8s - readinessImage: readiness-check:2.0.0 + readinessImage: onap/oom/readiness:3.0.1 # image pull policy pullPolicy: IfNotPresent |