From: Krzysztof Opasiak <k.opasiak@samsung.com>
Date: Wed, 15 Dec 2021 21:30:24 +0000 (+0000)
Subject: Merge "[GLOBAL] Bump curl image"
X-Git-Tag: 10.0.0~165
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=407a1d037bba1a046df79a56d75202c9c1b101e1;hp=-c;p=oom.git

Merge "[GLOBAL] Bump curl image"
---

407a1d037bba1a046df79a56d75202c9c1b101e1
diff --combined kubernetes/common/repositoryGenerator/values.yaml
index ee56577c63,c322bf0755..fb56c87754
--- a/kubernetes/common/repositoryGenerator/values.yaml
+++ b/kubernetes/common/repositoryGenerator/values.yaml
@@@ -24,7 -24,7 +24,7 @@@ global
  
    # common global images
    busyboxImage: busybox:1.32
-   curlImage: curlimages/curl:7.69.1
+   curlImage: curlimages/curl:7.80.0
    envsubstImage: dibi/envsubst:1
    # there's only latest image for htpasswd
    htpasswdImage: xmartlabs/htpasswd:latest
@@@ -32,7 -32,7 +32,7 @@@
    jreImage: onap/integration-java11:7.1.0
    kubectlImage: bitnami/kubectl:1.19
    loggingImage: beats/filebeat:5.5.0
 -  mariadbImage: bitnami/mariadb:10.5.8
 +  mariadbImage: bitnami/mariadb:10.6.5
    nginxImage: bitnami/nginx:1.18-debian-10
    postgresImage: crunchydata/crunchy-postgres:centos8-13.2-4.6.1
    readinessImage: onap/oom/readiness:3.0.1
diff --combined kubernetes/onap/values.yaml
index aecac0f71a,102ea382dc..b4e95b6756
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@@ -81,7 -81,7 +81,7 @@@ global
    busyboxImage: busybox:1.32
  
    # curl image
-   curlImage: curlimages/curl:7.69.1
+   curlImage: curlimages/curl:7.80.0
  
    # env substitution image
    envsubstImage: dibi/envsubst:1
@@@ -97,7 -97,7 +97,7 @@@
    loggingImage: beats/filebeat:5.5.0
  
    # mariadb client image
 -  mariadbImage: bitnami/mariadb:10.5.8
 +  mariadbImage: bitnami/mariadb:10.6.5
  
    # nginx server image
    nginxImage: bitnami/nginx:1.18-debian-10