[COMMON] Uses new generator for repos and images

This commit makes common 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: I35123faf99ae3bffea68bc39776f320c4168b45f

diff --git a/kubernetes/common/common/templates/_aafconfig.tpl b/kubernetes/common/common/templates/_aafconfig.tpl
index b1021ab..9309593 100644 (file)
--- a/kubernetes/common/common/templates/_aafconfig.tpl
+++ b/kubernetes/common/common/templates/_aafconfig.tpl
@@ -59,7 +59,7 @@
 {{-   $aafRoot := default $dot.Values.aafConfig .aafRoot -}}
 {{-   if $dot.Values.global.aafEnabled -}}
 - name: {{ include "common.name" $dot }}-aaf-readiness
-  image: "{{ include "common.repository" $dot }}/{{ $dot.Values.global.readinessImage }}"
+  image: {{ include "common.repository" $dot }}/{{ $dot.Values.global.readinessImage }}
   imagePullPolicy: {{ $dot.Values.global.pullPolicy | default $dot.Values.pullPolicy }}
   command:
   - /app/ready.py

diff --git a/kubernetes/common/common/templates/_log.tpl b/kubernetes/common/common/templates/_log.tpl
index 3ae536a..dc714ae 100644 (file)
--- a/kubernetes/common/common/templates/_log.tpl
+++ b/kubernetes/common/common/templates/_log.tpl
@@ -17,7 +17,7 @@
 {{- define "common.log.sidecar" -}}
 {{- if .Values.global.centralizedLoggingEnabled }}
 - name: {{ include "common.name" . }}-filebeat
-  image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+  image: {{ include "repositoryGenerator.image.logging" . }}
   imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
   volumeMounts:
   - name: filebeat-conf

diff --git a/kubernetes/common/common/values.yaml b/kubernetes/common/common/values.yaml
index 852f15c..0de859a 100644 (file)
--- a/kubernetes/common/common/values.yaml
+++ b/kubernetes/common/common/values.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Copyright © 2020 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.