summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-07-21 07:25:55 +0000
committerGerrit Code Review <gerrit@onap.org>2020-07-21 07:25:55 +0000
commitd9e156401cbea828b10ffea72722a6f68d8591f0 (patch)
tree81407c83a4451566847baa43459c2c3685ff9b1d
parent19a9c18f803365fff275edfa4a91ab6532e94d2d (diff)
parente9754a0a8d5208df5e7f8d65312df6f1f17f486f (diff)
Merge changes Idb112e86,Ia345251f
* changes: [COMMON] Use readinessCheck template inside certInitializer [COMMON] Fix name generation in readinessCheck template
-rw-r--r--kubernetes/common/certInitializer/requirements.yaml3
-rw-r--r--kubernetes/common/certInitializer/templates/_certInitializer.yaml19
-rw-r--r--kubernetes/common/certInitializer/values.yaml8
-rw-r--r--kubernetes/common/readinessCheck/templates/_readinessCheck.tpl25
4 files changed, 29 insertions, 26 deletions
diff --git a/kubernetes/common/certInitializer/requirements.yaml b/kubernetes/common/certInitializer/requirements.yaml
index 237f1d1354..31041ad669 100644
--- a/kubernetes/common/certInitializer/requirements.yaml
+++ b/kubernetes/common/certInitializer/requirements.yaml
@@ -16,3 +16,6 @@ dependencies:
- name: common
version: ~6.x-0
repository: 'file://../common'
+ - name: readinessCheck
+ version: ~6.x-0
+ repository: 'file://../readinessCheck'
diff --git a/kubernetes/common/certInitializer/templates/_certInitializer.yaml b/kubernetes/common/certInitializer/templates/_certInitializer.yaml
index 9c744f39ba..1250c1225e 100644
--- a/kubernetes/common/certInitializer/templates/_certInitializer.yaml
+++ b/kubernetes/common/certInitializer/templates/_certInitializer.yaml
@@ -42,24 +42,7 @@
{{- $initRoot := default $dot.Values.certInitializer .initRoot -}}
{{- $initName := default "certInitializer" -}}
{{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot)) }}
-- name: {{ include "common.name" $dot }}-aaf-readiness
- image: "{{ $subchartDot.Values.global.readinessRepository }}/{{ $subchartDot.Values.global.readinessImage }}"
- imagePullPolicy: {{ $subchartDot.Values.global.pullPolicy | default $subchartDot.Values.pullPolicy }}
- command:
- - /root/ready.py
- args:
- - --container-name
- - aaf-locate
- - --container-name
- - aaf-cm
- - --container-name
- - aaf-service
- env:
- - name: NAMESPACE
- valueFrom:
- fieldRef:
- apiVersion: v1
- fieldPath: metadata.namespace
+{{ include "common.readinessCheck.waitFor" $subchartDot }}
- name: {{ include "common.name" $dot }}-aaf-config
image: {{ include "common.repository" $subchartDot }}/{{ $subchartDot.Values.global.aafAgentImage }}
imagePullPolicy: {{ $subchartDot.Values.global.pullPolicy | default $subchartDot.Values.pullPolicy }}
diff --git a/kubernetes/common/certInitializer/values.yaml b/kubernetes/common/certInitializer/values.yaml
index fdee4c9bd2..416282f72a 100644
--- a/kubernetes/common/certInitializer/values.yaml
+++ b/kubernetes/common/certInitializer/values.yaml
@@ -13,8 +13,6 @@
# limitations under the License.
global:
- readinessRepository: oomk8s
- readinessImage: readiness-check:2.0.2
repository: nexus3.onap.org:10001
aafAgentImage: onap/aaf/aaf_agent:2.1.20
aafEnabled: true
@@ -29,6 +27,12 @@ secrets:
password: '{{ .Values.aafDeployPass }}'
passwordPolicy: required
+readinessCheck:
+ wait_for:
+ - aaf-locate
+ - aaf-cm
+ - aaf-service
+
aafDeployFqi: "changeme"
fqdn: ""
app_ns: "org.osaaf.aaf"
diff --git a/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl b/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl
index 1bdea6bb27..3cdf13a362 100644
--- a/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl
+++ b/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl
@@ -17,18 +17,29 @@
{{/*
Generate readiness part for a pod
Will look by default to .Values.wait_for
+ There are two formats available.
- Value of wait_for is an array of all pods /jobs to wait:
-
- Example:
+ The simple one (where wait_for is just list of containers):
wait_for:
- aaf-locate
- aaf-cm
- aaf-service
- The function can takes two arguments (inside a dictionary):
+ The powerful one (where wait_for is a map):
+
+ wait_for:
+ name: myname
+ containers:
+ - aaf-locate
+ - aaf-cm
+ - aaf-service
+
+
+ The function can takes below arguments (inside a dictionary):
- .dot : environment (.)
+ - .initRoot : the root dictionary of readinessCheck submodule
+ (default to .Values.readinessCheck)
- .wait_for : list of containers / jobs to wait for (default to
.Values.wait_for)
@@ -42,13 +53,15 @@
{{/* Our version of helm doesn't support deepCopy so we need this nasty trick */}}
{{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot)) }}
{{- $wait_for := default $initRoot.wait_for .wait_for -}}
-- name: {{ include "common.name" $dot }}-{{ $wait_for.name }}-readiness
+{{- $containers := index (ternary (dict "containers" $wait_for) $wait_for (kindIs "slice" $wait_for)) "containers" -}}
+{{- $namePart := index (ternary (dict) $wait_for (kindIs "slice" $wait_for)) "name" -}}
+- name: {{ include "common.name" $dot }}{{ ternary "" (printf "-%s" $namePart) (empty $namePart) }}-readiness
image: "{{ $subchartDot.Values.global.readinessRepository }}/{{ $subchartDot.Values.global.readinessImage }}"
imagePullPolicy: {{ $subchartDot.Values.global.pullPolicy | default $subchartDot.Values.pullPolicy }}
command:
- /root/ready.py
args:
- {{- range $container := $wait_for.containers }}
+ {{- range $container := $containers }}
- --container-name
- {{ tpl $container $dot }}
{{- end }}