From b086445cd7ee8f3f18f331e1c2a509cb4061f26f Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Thu, 19 Nov 2020 17:17:17 +0100 Subject: [PATCH] [COMMON][MONGO] Uses new tpls for repos / images This commit makes mongo template to use the new generator for repositories and images. As mongo images are coming from dockerhub, we're using directly this repository. Issue-ID: OOM-2364 Signed-off-by: Sylvain Desbureaux Change-Id: I9b3715de78d946d82b04f92b425bb9ae4fe2c806 --- kubernetes/common/mongo/requirements.yaml | 3 +++ kubernetes/common/mongo/templates/statefulset.yaml | 2 +- kubernetes/common/mongo/values.yaml | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/kubernetes/common/mongo/requirements.yaml b/kubernetes/common/mongo/requirements.yaml index 6ba617e990..09c09d698b 100644 --- a/kubernetes/common/mongo/requirements.yaml +++ b/kubernetes/common/mongo/requirements.yaml @@ -16,3 +16,6 @@ dependencies: - name: common version: ~6.x-0 repository: 'file://../common' + - name: repositoryGenerator + version: ~6.x-0 + repository: 'file://../repositoryGenerator' diff --git a/kubernetes/common/mongo/templates/statefulset.yaml b/kubernetes/common/mongo/templates/statefulset.yaml index df922ed004..73186b392d 100644 --- a/kubernetes/common/mongo/templates/statefulset.yaml +++ b/kubernetes/common/mongo/templates/statefulset.yaml @@ -39,7 +39,7 @@ spec: {{ include "common.podSecurityContext" . | indent 6 }} containers: - name: {{ include "common.name" . }} - image: "{{ .Values.dockerHubRepository }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: - docker-entrypoint.sh diff --git a/kubernetes/common/mongo/values.yaml b/kubernetes/common/mongo/values.yaml index 223234fa86..ee1d8c72fa 100644 --- a/kubernetes/common/mongo/values.yaml +++ b/kubernetes/common/mongo/values.yaml @@ -18,14 +18,12 @@ global: nodePortPrefix: 302 persistence: {} - readinessImage: onap/oom/readiness:3.0.1 ################################################################# # Application configuration defaults. ################################################################# -dockerHubRepository: docker.io image: library/mongo:4.0.8 pullPolicy: Always -- 2.16.6