diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-19 16:48:39 +0100 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-12-17 14:05:06 +0100 |
| commit | 145140b968430f5ac62ec72499b36d40f708054a (patch) | |
| tree | e7e29d95eef2405a650559e4c740e7497a809f9e /kubernetes/common | |
| parent | 79185b609b107b7e626973a026d2898c9d5534c8 (diff) | |
[COMMON][CertInit] Uses new tpls for repos / images
This commit makes CertInitializer 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: I5efa37225bfe05e2c7be7b8d2420ccaeb10afe62
Diffstat (limited to 'kubernetes/common')
5 files changed, 11 insertions, 4 deletions
diff --git a/kubernetes/common/certInitializer/requirements.yaml b/kubernetes/common/certInitializer/requirements.yaml index 81b0845ae0..3677d45a26 100644 --- a/kubernetes/common/certInitializer/requirements.yaml +++ b/kubernetes/common/certInitializer/requirements.yaml @@ -19,3 +19,6 @@ dependencies: - name: readinessCheck version: ~7.x-0 repository: 'file://../readinessCheck' + - name: repositoryGenerator + version: ~7.x-0 + repository: 'file://../repositoryGenerator' diff --git a/kubernetes/common/certInitializer/templates/_certInitializer.yaml b/kubernetes/common/certInitializer/templates/_certInitializer.yaml index 800364f1a2..c1459bf438 100644 --- a/kubernetes/common/certInitializer/templates/_certInitializer.yaml +++ b/kubernetes/common/certInitializer/templates/_certInitializer.yaml @@ -44,7 +44,7 @@ {{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot)) }} {{ include "common.readinessCheck.waitFor" $subchartDot }} - name: {{ include "common.name" $dot }}-aaf-config - image: {{ include "common.repository" $subchartDot }}/{{ $subchartDot.Values.global.aafAgentImage }} + image: {{ include "repositoryGenerator.repository" $subchartDot }}/{{ $subchartDot.Values.global.aafAgentImage }} imagePullPolicy: {{ $subchartDot.Values.global.pullPolicy | default $subchartDot.Values.pullPolicy }} volumeMounts: - mountPath: {{ $initRoot.mountPath }} @@ -116,7 +116,7 @@ {{- $initRoot := default $dot.Values.certInitializer .initRoot -}} {{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot)) }} - name: {{ include "common.name" $dot }}-import-custom-certs - image: {{ $subchartDot.Values.global.jreImage }} + image: {{ include "repositoryGenerator.image.jre" $subchartDot }} imagePullPolicy: {{ $subchartDot.Values.global.pullPolicy | default $subchartDot.Values.pullPolicy }} securityContext: runAsUser: 0 diff --git a/kubernetes/common/certInitializer/values.yaml b/kubernetes/common/certInitializer/values.yaml index 66251fa29a..e7a0a3f02e 100644 --- a/kubernetes/common/certInitializer/values.yaml +++ b/kubernetes/common/certInitializer/values.yaml @@ -13,10 +13,8 @@ # limitations under the License. global: - repository: nexus3.onap.org:10001 aafAgentImage: onap/aaf/aaf_agent:2.1.20 aafEnabled: true - jreImage: registry.gitlab.com/onap-integration/docker/onap-java pullPolicy: Always diff --git a/kubernetes/common/repositoryGenerator/templates/_repository.tpl b/kubernetes/common/repositoryGenerator/templates/_repository.tpl index c351db1ba0..ba22bfbd60 100644 --- a/kubernetes/common/repositoryGenerator/templates/_repository.tpl +++ b/kubernetes/common/repositoryGenerator/templates/_repository.tpl @@ -90,6 +90,10 @@ {{- include "repositoryGenerator.image._helper" (merge (dict "image" "htpasswdImage") .) }} {{- end -}} +{{- define "repositoryGenerator.image.jre" -}} + {{- include "repositoryGenerator.image._helper" (merge (dict "image" "jreImage") .) }} +{{- end -}} + {{- define "repositoryGenerator.image.kubectl" -}} {{- include "repositoryGenerator.image._helper" (merge (dict "image" "kubectlImage") .) }} {{- end -}} diff --git a/kubernetes/common/repositoryGenerator/values.yaml b/kubernetes/common/repositoryGenerator/values.yaml index 003782ded1..def7381e46 100644 --- a/kubernetes/common/repositoryGenerator/values.yaml +++ b/kubernetes/common/repositoryGenerator/values.yaml @@ -25,6 +25,7 @@ global: envsubstImage: dibi/envsubst:1 # there's only latest image for htpasswd htpasswdImage: xmartlabs/htpasswd:latest + jreImage: onap/integration-java11:7.1.0 kubectlImage: bitnami/kubectl:1.19 loggingImage: beats/filebeat:5.5.0 mariadbImage: bitnami/mariadb:10.5.8 @@ -54,6 +55,7 @@ imageRepoMapping: curlImage: dockerHubRepository envsubstImage: dockerHubRepository htpasswdImage: dockerHubRepository + jreImage: repository kubectlImage: dockerHubRepository loggingImage: elasticRepository mariadbImage: dockerHubRepository |