diff options
author | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-21 22:17:40 +0100 |
---|---|---|
committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-22 17:12:48 +0000 |
commit | cad63e58e3ff4c5a488f9a70de21e87aa592eb4e (patch) | |
tree | ffce4933751d9d9e45a82a999b8db62c29c71004 /kubernetes/dcaegen2/components/dcae-deployment-handler/templates | |
parent | 2b2aa11021114438591d184af19fde6bbf06950a (diff) |
[DCAE] Uses new tpls for repos / images
This commit makes DCAE 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: Ib0ba117864a95750ee5762636d94d22e9d029959
Diffstat (limited to 'kubernetes/dcaegen2/components/dcae-deployment-handler/templates')
-rwxr-xr-x | kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml index cc30820043..1b39dc6e2f 100755 --- a/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml +++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml @@ -41,7 +41,7 @@ spec: spec: initContainers: - name: {{ include "common.name" . }}-readiness - image: {{ include "common.repository" . }}/{{ .Values.global.readinessImage }} + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: - /app/ready.py @@ -69,14 +69,14 @@ spec: fieldPath: status.podIP - name: aaf_locator_fqdn value: dcae - image: {{ .Values.global.tlsRepository }}/{{ .Values.global.tlsImage }} + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.tlsImage }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} resources: {} volumeMounts: - mountPath: /opt/app/osaaf name: tls-info - name: init-consul - image: {{ .Values.global.consulLoaderRepository }}/{{ .Values.global.consulLoaderImage }} + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.consulLoaderImage }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} args: - --service @@ -91,7 +91,7 @@ spec: name: dh-config containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} resources: {{ include "common.resources" . | indent 12 }} @@ -143,7 +143,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: status.podIP - image: {{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }} + image: {{ include "repositoryGenerator.image.logging" . }} imagePullPolicy: IfNotPresent resources: {} volumeMounts: |