aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/dcaegen2/components/dcae-config-binding-service
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-21 22:17:40 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-22 17:12:48 +0000
commitcad63e58e3ff4c5a488f9a70de21e87aa592eb4e (patch)
treeffce4933751d9d9e45a82a999b8db62c29c71004 /kubernetes/dcaegen2/components/dcae-config-binding-service
parent2b2aa11021114438591d184af19fde6bbf06950a (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-config-binding-service')
-rw-r--r--kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml3
-rw-r--r--kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml12
-rw-r--r--kubernetes/dcaegen2/components/dcae-config-binding-service/values.yaml8
3 files changed, 9 insertions, 14 deletions
diff --git a/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml b/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml
index caff1e5dc4..c2681fb217 100644
--- a/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml
@@ -17,3 +17,6 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml
index 7277db6cf6..65d0b36927 100644
--- a/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml
@@ -40,7 +40,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
@@ -67,7 +67,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: status.podIP
- image: {{ .Values.global.tlsRepository }}/{{ .Values.global.tlsImage }}
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.tlsImage }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
resources: {}
volumeMounts:
@@ -77,7 +77,7 @@ spec:
containers:
{{- if .Values.service.secure.enabled }}
- 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 }}
@@ -114,7 +114,7 @@ spec:
- name: HTTPS_KEY_PATH
value: "/opt/tls/key.pem"
- name: {{ include "common.name" . }}-fb-onap
- image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+ image: {{ include "repositoryGenerator.image.logging" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- name: {{ include "common.fullname" . }}-fb-conf
@@ -127,7 +127,7 @@ spec:
{{ end }}
{{- if .Values.service.insecure.enabled }}
- name: {{ include "common.name" . }}-insecure
- 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 }}
@@ -156,7 +156,7 @@ spec:
- name: CONSUL_HOST
value: consul.{{ include "common.namespace" . }}
- name: {{ include "common.name" . }}-fb-onap-i
- image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+ image: {{ include "repositoryGenerator.image.logging" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- name: {{ include "common.fullname" . }}-fb-conf
diff --git a/kubernetes/dcaegen2/components/dcae-config-binding-service/values.yaml b/kubernetes/dcaegen2/components/dcae-config-binding-service/values.yaml
index a7be74a7ad..63f96044fa 100644
--- a/kubernetes/dcaegen2/components/dcae-config-binding-service/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/values.yaml
@@ -21,14 +21,7 @@
global:
nodePortPrefix: 302
nodePortPrefixExt: 304
- readinessImage: onap/oom/readiness:3.0.1
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
- tlsRepository: nexus3.onap.org:10001
tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:2.1.0
- repositoryCred:
- user: docker
- password: docker
config:
logstashServiceName: log-ls
@@ -43,7 +36,6 @@ config:
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/org.onap.dcaegen2.platform.configbinding:2.5.3
pullPolicy: Always