[SO] Uses new tpls for repos / images
This commit makes SO chart to use the new generator for repositories and
images.
Issue-ID: OOM-2364
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: Ife4e1fcfff565b3ada7e726913826e2c9f76bc07
diff --git a/kubernetes/so/components/so-oof-adapter/requirements.yaml b/kubernetes/so/components/so-oof-adapter/requirements.yaml
index 036860d..3398a2d 100644
--- a/kubernetes/so/components/so-oof-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-oof-adapter/requirements.yaml
@@ -19,6 +19,9 @@
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
- name: soHelpers
version: ~6.x-0
repository: 'file://../soHelpers'
diff --git a/kubernetes/so/components/so-oof-adapter/templates/deployment.yaml b/kubernetes/so/components/so-oof-adapter/templates/deployment.yaml
index 72799d1..62ebfff 100755
--- a/kubernetes/so/components/so-oof-adapter/templates/deployment.yaml
+++ b/kubernetes/so/components/so-oof-adapter/templates/deployment.yaml
@@ -32,7 +32,7 @@
initContainers: {{ include "so.certificate.container_importer" . | nindent 6 }}
containers:
- name: {{ include "common.name" . }}
- image: {{ include "common.repository" . }}/{{ .Values.image }}
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
resources:
{{ include "common.resources" . | indent 10 }}
env:
@@ -71,7 +71,7 @@
ports: {{- include "common.containerPorts" . | nindent 12 }}
# Filebeat sidecar container
- name: {{ include "common.name" . }}-filebeat-onap
- image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+ image: {{ include "repositoryGenerator.image.logging" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- name: {{ include "common.fullname" . }}-filebeat-conf
diff --git a/kubernetes/so/components/so-oof-adapter/values.yaml b/kubernetes/so/components/so-oof-adapter/values.yaml
index 6bddf29..13a0f0f 100755
--- a/kubernetes/so/components/so-oof-adapter/values.yaml
+++ b/kubernetes/so/components/so-oof-adapter/values.yaml
@@ -18,11 +18,6 @@
global:
nodePortPrefix: 302
nodePortPrefixExt: 304
- repository: nexus3.onap.org:10001
- readinessRepository: oomk8s
- readinessImage: readiness-check:2.0.2
- aafAgentImage: onap/aaf/aaf_agent:2.1.20
- envsubstImage: dibi/envsubst
persistence:
mountPath: /dockerdata-nfs
security:
@@ -76,7 +71,6 @@
#################################################################
# Application configuration defaults.
#################################################################
-repository: nexus3.onap.org:10001
image: onap/so/so-oof-adapter:1.7.4
pullPolicy: Always