diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2021-01-12 08:31:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-01-12 08:31:59 +0000 |
| commit | bb57f3ba34daefe19b63eaf079a8eedef5251d0e (patch) | |
| tree | a332443b3a2487eff170637548adc039153c1cc1 /kubernetes/common | |
| parent | 83f519932e096f689ed995812e3e7918cb169509 (diff) | |
| parent | 6cda61042bd277665cf35cc27410cebd08b9e4e0 (diff) | |
Merge "[COMMON][Readiness] Uses new tpls for repos / images"
Diffstat (limited to 'kubernetes/common')
| -rw-r--r-- | kubernetes/common/Makefile | 2 | ||||
| -rw-r--r-- | kubernetes/common/readinessCheck/requirements.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/common/readinessCheck/templates/_readinessCheck.tpl | 2 | ||||
| -rw-r--r-- | kubernetes/common/readinessCheck/values.yaml | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/kubernetes/common/Makefile b/kubernetes/common/Makefile index 43d62f1a82..c7aba635c1 100644 --- a/kubernetes/common/Makefile +++ b/kubernetes/common/Makefile @@ -21,7 +21,7 @@ COMMON_CHARTS_DIR := common EXCLUDES := PROCESSED_LAST := cert-wrapper repository-wrapper -PROCESSED_FIRST := repositoryGenerator certInitializer +PROCESSED_FIRST := repositoryGenerator readinessCheck certInitializer TO_FILTER := $(PROCESSED_FIRST) $(EXCLUDES) $(PROCESSED_LAST) HELM_BIN := helm diff --git a/kubernetes/common/readinessCheck/requirements.yaml b/kubernetes/common/readinessCheck/requirements.yaml index 51e8789caf..9ef1615aae 100644 --- a/kubernetes/common/readinessCheck/requirements.yaml +++ b/kubernetes/common/readinessCheck/requirements.yaml @@ -16,3 +16,6 @@ dependencies: - name: common version: ~7.x-0 repository: 'file://../common' + - name: repositoryGenerator + version: ~7.x-0 + repository: 'file://../repositoryGenerator' diff --git a/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl b/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl index aa03938d28..95de6ec29f 100644 --- a/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl +++ b/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl @@ -65,7 +65,7 @@ {{- $namePart := index (ternary (dict) $wait_for (kindIs "slice" $wait_for)) "name" -}} {{- $jobs := index (ternary (dict) $wait_for (kindIs "slice" $wait_for)) "jobs" -}} - name: {{ include "common.name" $dot }}{{ ternary "" (printf "-%s" $namePart) (empty $namePart) }}-readiness - image: "{{ include "common.repository" $subchartDot }}/{{ $subchartDot.Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" $subchartDot }} imagePullPolicy: {{ $subchartDot.Values.global.pullPolicy | default $subchartDot.Values.pullPolicy }} command: - /app/ready.py diff --git a/kubernetes/common/readinessCheck/values.yaml b/kubernetes/common/readinessCheck/values.yaml index 7bd0c3d679..b15b1c2af3 100644 --- a/kubernetes/common/readinessCheck/values.yaml +++ b/kubernetes/common/readinessCheck/values.yaml @@ -13,7 +13,6 @@ # limitations under the License. global: - readinessImage: onap/oom/readiness:3.0.1 pullPolicy: Always limits: |