From: Sylvain Desbureaux Date: Mon, 21 Feb 2022 16:05:08 +0000 (+0000) Subject: Merge "[OOM] Avoid duplicate DrPublisher creation via DCAE" X-Git-Tag: 10.0.0~130 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3ef6f3bb07af4b45edf30cd482e0b30cbf194bb7;hp=-c;p=oom.git Merge "[OOM] Avoid duplicate DrPublisher creation via DCAE" --- 3ef6f3bb07af4b45edf30cd482e0b30cbf194bb7 diff --combined kubernetes/common/repositoryGenerator/values.yaml index 84685b6cd6,c168e4e1d7..7058f865bc --- a/kubernetes/common/repositoryGenerator/values.yaml +++ b/kubernetes/common/repositoryGenerator/values.yaml @@@ -1,6 -1,6 +1,6 @@@ # Copyright © 2020 Orange # Copyright © 2021 Nokia, AT&T - # Modifications Copyright (C) 2021 Nordix Foundation. + # Modifications Copyright (c) 2022 Nordix Foundation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@@ -28,10 -28,7 +28,10 @@@ global envsubstImage: dibi/envsubst:1 # there's only latest image for htpasswd htpasswdImage: xmartlabs/htpasswd:latest - jettyImage: jetty:9-jdk11-slim + # if you change jetty image, you'll also need to update jar file which is + # "hardcoded" to the value... + # (/usr/local/jetty/lib/jetty-util-9.4.45.v20220203.jar) for 9.4.45 + jettyImage: jetty:9.4.45-jdk11-slim jreImage: onap/integration-java11:10.0.0 kubectlImage: bitnami/kubectl:1.19 loggingImage: beats/filebeat:5.5.0 @@@ -40,7 -37,7 +40,7 @@@ 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 - dbcClientImage: onap/dmaap/dbc-client:2.0.7 + dbcClientImage: onap/dmaap/dbc-client:2.0.9 quitQuitImage: onap/oom/readiness:4.1.0 # Default credentials