From ce0d76b9c1997d1173280e238fed7e586af7fc26 Mon Sep 17 00:00:00 2001 From: Krzysztof Opasiak Date: Tue, 2 Jun 2020 11:50:12 +0200 Subject: [PATCH] [common] Make sure that we declare repository in certInitializer Not all components declare repository in the global section which may lead to some error when processing just a single component instead of whole onap. To avoid this let's make sure that cerInitializer sets repository url internally. Issue-ID: OOM-2416 Signed-off-by: Krzysztof Opasiak Change-Id: I4fd2a235b188c7ee09d0173dbaa873141187a077 (cherry picked from commit 1b6861577c9b0a67e14ce70b1ddecc2e70db88ca) --- kubernetes/common/certInitializer/templates/_certInitializer.yaml | 2 +- kubernetes/common/certInitializer/values.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kubernetes/common/certInitializer/templates/_certInitializer.yaml b/kubernetes/common/certInitializer/templates/_certInitializer.yaml index 33f06495cc..7cf3ba6795 100644 --- a/kubernetes/common/certInitializer/templates/_certInitializer.yaml +++ b/kubernetes/common/certInitializer/templates/_certInitializer.yaml @@ -62,7 +62,7 @@ apiVersion: v1 fieldPath: metadata.namespace - name: {{ include "common.name" $dot }}-aaf-config - image: {{ (default $subchartDot.Values.repository $subchartDot.Values.global.repository) }}/{{ $subchartDot.Values.global.aafAgentImage }} + image: {{ include "common.repository" $subchartDot }}/{{ $subchartDot.Values.global.aafAgentImage }} imagePullPolicy: {{ $subchartDot.Values.global.pullPolicy | default $subchartDot.Values.pullPolicy }} volumeMounts: - mountPath: {{ $initRoot.mountPath }} diff --git a/kubernetes/common/certInitializer/values.yaml b/kubernetes/common/certInitializer/values.yaml index b55ba5e2f3..fdee4c9bd2 100644 --- a/kubernetes/common/certInitializer/values.yaml +++ b/kubernetes/common/certInitializer/values.yaml @@ -15,6 +15,7 @@ global: readinessRepository: oomk8s readinessImage: readiness-check:2.0.2 + repository: nexus3.onap.org:10001 aafAgentImage: onap/aaf/aaf_agent:2.1.20 aafEnabled: true -- 2.16.6