From ffd944b874af386000d157e58be0475561021340 Mon Sep 17 00:00:00 2001 From: Jack Lucas Date: Fri, 18 Aug 2023 11:13:05 -0400 Subject: [PATCH] [DMAAP] Update datarouter image versions Update to use container with shortened "X-DMAAP-DR-ON-BEHALF-OF" name for datarouter provisioning. Issue-ID: DMAAP-1893 Signed-off-by: Jack Lucas Change-Id: I21b043b8709000d2a30ea4e07e3fd0f8693a393c --- kubernetes/common/common/templates/_dmaapProvisioning.tpl | 2 -- kubernetes/common/repositoryGenerator/values.yaml | 2 +- kubernetes/dmaap/components/dmaap-dr-node/values.yaml | 2 +- kubernetes/dmaap/components/dmaap-dr-prov/values.yaml | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/kubernetes/common/common/templates/_dmaapProvisioning.tpl b/kubernetes/common/common/templates/_dmaapProvisioning.tpl index 3cf5bf1207..e7b90ea8ff 100644 --- a/kubernetes/common/common/templates/_dmaapProvisioning.tpl +++ b/kubernetes/common/common/templates/_dmaapProvisioning.tpl @@ -107,8 +107,6 @@ image: {{ include "repositoryGenerator.image.drProvClient" $dot }} imagePullPolicy: {{ $dot.Values.global.pullPolicy | default $dot.Values.pullPolicy }} env: - - name: ONBEHALFHDR - value: "X-DMAAP-DR-ON-BEHALF-OF: drprovcl" {{- range $cred := $dot.Values.credentials }} - name: {{ $cred.name }} {{- include "common.secret.envFromSecretFast" (dict "global" $dot "uid" $cred.uid "key" $cred.key) | nindent 4 }} diff --git a/kubernetes/common/repositoryGenerator/values.yaml b/kubernetes/common/repositoryGenerator/values.yaml index 2c94c29b15..66ab4e239e 100644 --- a/kubernetes/common/repositoryGenerator/values.yaml +++ b/kubernetes/common/repositoryGenerator/values.yaml @@ -41,7 +41,7 @@ global: postgresImage: crunchydata/crunchy-postgres:centos8-13.2-4.6.1 readinessImage: onap/oom/readiness:3.0.1 dcaePolicySyncImage: onap/org.onap.dcaegen2.deployments.dcae-services-policy-sync:1.0.1 - drProvClientImage: onap/dmaap/datarouter-prov-client:2.1.14 + drProvClientImage: onap/dmaap/datarouter-prov-client:2.1.15 quitQuitImage: onap/oom/readiness:4.1.0 # Default credentials diff --git a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml index d6815fdee1..5e654a9eb3 100644 --- a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml +++ b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml @@ -23,7 +23,7 @@ global: # Application configuration defaults. ################################################################# # application image -image: onap/dmaap/datarouter-node:2.1.14 +image: onap/dmaap/datarouter-node:2.1.15 pullPolicy: Always # default number of instances diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml index ba81f768e6..979769667b 100644 --- a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml +++ b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml @@ -38,7 +38,7 @@ secrets: # Application configuration defaults. ################################################################# # application image -image: onap/dmaap/datarouter-prov:2.1.14 +image: onap/dmaap/datarouter-prov:2.1.15 pullPolicy: Always # default number of instances -- 2.16.6