summaryrefslogtreecommitdiffstats
path: root/kubernetes/common
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-19 16:56:22 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-01-08 11:02:20 +0100
commit6cda61042bd277665cf35cc27410cebd08b9e4e0 (patch)
treead6930f265688a0772b855926fbb2749767a24f8 /kubernetes/common
parent9b759702f0cc15b9f20cb71c77e61da7379b3b43 (diff)
[COMMON][Readiness] Uses new tpls for repos / images
This commit makes Readiness Check template to use the new generator for repositories and images. Issue-ID: OOM-2364 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I6d115a071e11f9e992f04ec2a14595a5aed5401b
Diffstat (limited to 'kubernetes/common')
-rw-r--r--kubernetes/common/Makefile2
-rw-r--r--kubernetes/common/readinessCheck/requirements.yaml3
-rw-r--r--kubernetes/common/readinessCheck/templates/_readinessCheck.tpl2
-rw-r--r--kubernetes/common/readinessCheck/values.yaml1
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: