aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/dcaemod/components/dcaemod-designtool
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-21 22:19:29 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-21 22:19:29 +0100
commit99baf8e526d5a2019a7dadf82446e1303afc86e4 (patch)
treedcd7db60be63397cbad2d965cc813e0b305b0738 /kubernetes/dcaemod/components/dcaemod-designtool
parent2b2aa11021114438591d184af19fde6bbf06950a (diff)
[DCAEMOD] Uses new tpls for repos / images
This commit makes DCAE Mod 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: I35a04b043e78b9247a466c2f9b0d4041147a1d7a
Diffstat (limited to 'kubernetes/dcaemod/components/dcaemod-designtool')
-rw-r--r--kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml3
-rw-r--r--kubernetes/dcaemod/components/dcaemod-designtool/templates/deployment.yaml6
-rw-r--r--kubernetes/dcaemod/components/dcaemod-designtool/values.yaml3
3 files changed, 6 insertions, 6 deletions
diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml
index c84ca79fd9..627dc59e81 100644
--- a/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml
@@ -19,3 +19,6 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/templates/deployment.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/templates/deployment.yaml
index 2929b56bc6..bd2766f6db 100644
--- a/kubernetes/dcaemod/components/dcaemod-designtool/templates/deployment.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-designtool/templates/deployment.yaml
@@ -28,7 +28,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
@@ -48,7 +48,7 @@ spec:
apiVersion: v1
fieldPath: metadata.namespace
- name: {{ include "common.name" . }}-create-bucket
- image: {{ .Values.config.curlImage }}
+ image: {{ include "repositoryGenerator.image.curl" . }}
args:
- -kv
- -X
@@ -61,7 +61,7 @@ spec:
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports: {{ include "common.containerPorts" . | nindent 12 }}
{{- if eq .Values.liveness.enabled true }}
diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml
index 5be8cacefd..3daca28476 100644
--- a/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml
@@ -22,7 +22,6 @@ global:
persistence: {}
nodePortPrefix: 302
nodePortPrefixExt: 304
- readinessImage: onap/oom/readiness:3.0.1
ingress:
enabled: true
@@ -32,10 +31,8 @@ global:
config:
nifiJarsIndexURL: http://dcaemod-genprocessor:8080/nifi-jars
distributorAPIURL: /distributor
- curlImage: curlimages/curl:7.68.0
# application image
-repository: nexus3.onap.org:10001
image: onap/org.onap.dcaegen2.platform.mod.designtool-web:1.0.2
service: