diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2021-01-20 15:22:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-01-20 15:22:50 +0000 |
| commit | 0e6972b5a5f94d76848a22f5155f49925522b324 (patch) | |
| tree | 4a243821d2b7869d4c6f26d77f9468a42b85a85e | |
| parent | 086e3d9388d25df3df65bb06422ad25a0f476d9b (diff) | |
| parent | 54fcf96c94b00006895ccb074cc8aa68867194e5 (diff) | |
Merge "[COMMON] Uses new generator for repos and images"
| -rw-r--r-- | kubernetes/common/common/templates/_aafconfig.tpl | 2 | ||||
| -rw-r--r-- | kubernetes/common/common/templates/_log.tpl | 2 | ||||
| -rw-r--r-- | kubernetes/common/common/values.yaml | 1 |
3 files changed, 3 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 diff --git a/kubernetes/common/common/values.yaml b/kubernetes/common/common/values.yaml index 852f15c810..0de859a3ba 100644 --- 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. |