aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2020-07-16 21:06:39 +0200
committerKrzysztof Opasiak <k.opasiak@samsung.com>2020-07-16 21:08:02 +0200
commite9754a0a8d5208df5e7f8d65312df6f1f17f486f (patch)
tree234d80c846b1a80310c7c92e37a2bceba190ed87 /kubernetes
parente00bd6af6003beb51111eb3a1a7dd2def3bf80df (diff)
[COMMON] Use readinessCheck template inside certInitializer
Instead of manually creating readiness init container let's use our dedicated template for this. Issue-ID: OOM-2511 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Change-Id: Idb112e864b7899e7a1e76d139c6cc6a94851a090
Diffstat (limited to 'kubernetes')
-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
3 files changed, 10 insertions, 20 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"