summaryrefslogtreecommitdiffstats
path: root/kubernetes/portal/components/portal-app/templates/deployment.yaml
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-19 17:59:19 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-21 16:42:39 +0000
commit585dd9dd7c02c76745cc7f3ec8a78b9fb0fc352b (patch)
treeeb8863512125fe1729b06fb6273af70826968422 /kubernetes/portal/components/portal-app/templates/deployment.yaml
parent2b2aa11021114438591d184af19fde6bbf06950a (diff)
[PORTAL] Uses new tpls for repos / images
This commit makes Portal 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: Ib49380460bbbf581c364033fc0fde707ee84082b
Diffstat (limited to 'kubernetes/portal/components/portal-app/templates/deployment.yaml')
-rw-r--r--kubernetes/portal/components/portal-app/templates/deployment.yaml8
1 files changed, 4 insertions, 4 deletions
diff --git a/kubernetes/portal/components/portal-app/templates/deployment.yaml b/kubernetes/portal/components/portal-app/templates/deployment.yaml
index 068a0af3c2..71b2aa3227 100644
--- a/kubernetes/portal/components/portal-app/templates/deployment.yaml
+++ b/kubernetes/portal/components/portal-app/templates/deployment.yaml
@@ -38,7 +38,7 @@ spec:
spec:
initContainers:
- name: {{ include "common.name" . }}-job-completion
- image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: "{{ .Values.global.pullPolicy | default .Values.pullPolicy }}"
command:
- /app/ready.py
@@ -52,7 +52,7 @@ spec:
apiVersion: v1
fieldPath: metadata.namespace
- name: {{ include "common.name" . }}-portal-config
- image: "{{ .Values.global.envsubstImage }}"
+ image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- sh
@@ -90,7 +90,7 @@ spec:
{{ include "common.certInitializer.initContainer" . | indent 6 }}
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["bash","-c"]
{{- if .Values.global.aafEnabled }}
@@ -170,7 +170,7 @@ spec:
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
- name: filebeat-onap
- image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+ image: {{ include "repositoryGenerator.image.logging" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: /usr/share/filebeat/filebeat.yml