summaryrefslogtreecommitdiffstats
path: root/kubernetes/sdc/components/sdc-wfd-be
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-19 17:56:08 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-24 09:39:33 +0100
commit0a1eaf3fe57ea88f9a166055b7338898bc097eb6 (patch)
treea8fd59366f91204817e2f13b1ffdf68ccf23be8d /kubernetes/sdc/components/sdc-wfd-be
parent5229ec2ce61bbaf416c746c91254cb39175ff2bc (diff)
[SDC] Uses new tpls for repos / images
This commit makes SDC 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: I91eb59675ef0080f67aced0ae99c238143461efe
Diffstat (limited to 'kubernetes/sdc/components/sdc-wfd-be')
-rw-r--r--kubernetes/sdc/components/sdc-wfd-be/requirements.yaml3
-rw-r--r--kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml4
-rw-r--r--kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml4
-rw-r--r--kubernetes/sdc/components/sdc-wfd-be/values.yaml4
4 files changed, 7 insertions, 8 deletions
diff --git a/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml b/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml
index b1d52ae32a..4bbe175a80 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml
@@ -20,4 +20,7 @@
dependencies:
- name: certInitializer
version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml b/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml
index e58ffe87a0..9defb8e1ce 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml
@@ -39,7 +39,7 @@ spec:
initContainers: {{ include "common.certInitializer.initContainer" . | nindent 6 }}
{{- if .Values.initJob.enabled }}
- 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
@@ -62,7 +62,7 @@ spec:
{{ end }}
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
{{- if .Values.global.aafEnabled }}
command:
diff --git a/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml b/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml
index 9c69ade96e..f7b0cfa04b 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml
@@ -37,7 +37,7 @@ spec:
restartPolicy: Never
initContainers:
- name: {{ include "common.name" . }}-init-readiness
- image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /app/ready.py
@@ -61,7 +61,7 @@ spec:
memory: 20Mi
containers:
- name: {{ include "common.name" . }}-job
- image: "{{ include "common.repository" . }}/{{ .Values.configInitImage }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.configInitImage }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: CS_HOST
diff --git a/kubernetes/sdc/components/sdc-wfd-be/values.yaml b/kubernetes/sdc/components/sdc-wfd-be/values.yaml
index 893a1b9f31..4aebe7ab9a 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/values.yaml
@@ -18,9 +18,6 @@
#################################################################
global:
nodePortPrefix: 302
- readinessImage: onap/oom/readiness:3.0.1
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
aafEnabled: true
cassandra:
#This flag allows SDC to instantiate its own cluster, serviceName
@@ -61,7 +58,6 @@ certInitializer:
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/sdc-workflow-backend:1.7.0
configInitImage: onap/sdc-workflow-init:1.7.0
pullPolicy: Always