summaryrefslogtreecommitdiffstats
path: root/kubernetes/dcaemod/components/dcaemod-distributor-api
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-distributor-api
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-distributor-api')
-rw-r--r--kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml3
-rw-r--r--kubernetes/dcaemod/components/dcaemod-distributor-api/templates/deployment.yaml4
-rw-r--r--kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml2
3 files changed, 5 insertions, 4 deletions
diff --git a/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml
index df3df964cb..51543cf310 100644
--- a/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-distributor-api/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-distributor-api/templates/deployment.yaml b/kubernetes/dcaemod/components/dcaemod-distributor-api/templates/deployment.yaml
index e21efd1f87..696b43a536 100644
--- a/kubernetes/dcaemod/components/dcaemod-distributor-api/templates/deployment.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-distributor-api/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
@@ -49,7 +49,7 @@ spec:
fieldPath: metadata.namespace
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-distributor-api/values.yaml b/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml
index c717ca3309..274edcd4a3 100644
--- a/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml
@@ -22,7 +22,6 @@ global:
persistence: {}
nodePortPrefix: 302
nodePortPrefixExt: 304
- readinessImage: onap/oom/readiness:3.0.1
ingress:
enabled: true
@@ -34,7 +33,6 @@ config:
onboardingAPIURL: http://dcaemod-onboarding-api:8080/onboarding
# application image
-repository: nexus3.onap.org:10001
image: onap/org.onap.dcaegen2.platform.mod.distributorapi:1.1.0
service: