From 99baf8e526d5a2019a7dadf82446e1303afc86e4 Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Sat, 21 Nov 2020 22:19:29 +0100 Subject: [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 Change-Id: I35a04b043e78b9247a466c2f9b0d4041147a1d7a --- kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml | 3 +++ .../components/dcaemod-nifi-registry/templates/deployment.yaml | 4 ++-- kubernetes/dcaemod/components/dcaemod-nifi-registry/values.yaml | 2 -- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'kubernetes/dcaemod/components/dcaemod-nifi-registry') diff --git a/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml index df3df964cb..51543cf310 100644 --- a/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml +++ b/kubernetes/dcaemod/components/dcaemod-nifi-registry/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-nifi-registry/templates/deployment.yaml b/kubernetes/dcaemod/components/dcaemod-nifi-registry/templates/deployment.yaml index d601d92b41..90561ac231 100644 --- a/kubernetes/dcaemod/components/dcaemod-nifi-registry/templates/deployment.yaml +++ b/kubernetes/dcaemod/components/dcaemod-nifi-registry/templates/deployment.yaml @@ -32,7 +32,7 @@ spec: # this initContainer changes ownership to uid 1000 gid 1000 # (tried using a securityContext in the pod spec, but it didn't seem to work) - name: set-permissions - image: busybox:latest + image: {{ include "repositoryGenerator.image.busybox" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: - sh @@ -43,7 +43,7 @@ spec: name: flow-storage containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .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-nifi-registry/values.yaml b/kubernetes/dcaemod/components/dcaemod-nifi-registry/values.yaml index 02028f5117..25b3b9e318 100644 --- a/kubernetes/dcaemod/components/dcaemod-nifi-registry/values.yaml +++ b/kubernetes/dcaemod/components/dcaemod-nifi-registry/values.yaml @@ -22,7 +22,6 @@ global: persistence: {} nodePortPrefix: 302 nodePortPrefixExt: 304 - readinessImage: onap/oom/readiness:3.0.1 config: dbURL: jdbc:h2:./database/nifi-registry-primary @@ -37,7 +36,6 @@ secrets: passwordPolicy: generate # application image -repository: docker.io image: apache/nifi-registry:0.5.0 service: -- cgit 1.2.3-korg