diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-19 16:41:07 +0100 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-01-18 08:49:08 +0100 |
| commit | 54fcf96c94b00006895ccb074cc8aa68867194e5 (patch) | |
| tree | 1fdbd617074d4568b9640ff468d27c77d4250296 /kubernetes/common/common/templates | |
| parent | 552aea3d9fad719414a6ed922de96cf69f0bb5e8 (diff) | |
[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
Diffstat (limited to 'kubernetes/common/common/templates')
| -rw-r--r-- | kubernetes/common/common/templates/_aafconfig.tpl | 2 | ||||
| -rw-r--r-- | kubernetes/common/common/templates/_log.tpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kubernetes/common/common/templates/_aafconfig.tpl b/kubernetes/common/common/templates/_aafconfig.tpl index b1021ab9d7..930959337a 100644 --- 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 3ae536aff3..dc714aecc4 100644 --- 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 |