Merge changes from topic "OOM-2927" into istanbul

* changes:
  [ANSIBLE] Override sha tag for kube-webhook-certgen image
  [BUILD] Update image list for kube-prometheus-stack
  Revert "[PATCH] Add OOM patch for fixing mariadb metrics ServiceMonitor label selector"
  [ANSIBLE] [BUILD] Upgrade Kube Prometheus Stack to 32.2.1
  [MOLECULE] Pin the markupsafe pip package in virtualenv

7 files changed, 18 insertions, 50 deletions

diff --git a/ansible/group_vars/infrastructure.yml b/ansible/group_vars/infrastructure.yml
index 82316043..62c52969 100755
--- a/ansible/group_vars/infrastructure.yml
+++ b/ansible/group_vars/infrastructure.yml
@@ -28,5 +28,5 @@ dns_server_image: andyshinn/dnsmasq:2.76
 nginx_server_image: own_nginx:2.0.0
 chartmuseum_server_image: chartmuseum/chartmuseum
 kube_prometheus_stack_enabled: false
-kube_prometheus_stack_version: 18.0.4
+kube_prometheus_stack_version: 32.2.1
 cert_manager_version: 1.5.4
diff --git a/ansible/roles/kube-prometheus-stack/defaults/main.yml b/ansible/roles/kube-prometheus-stack/defaults/main.yml
index 81dc02ec..4b508e03 100644
--- a/ansible/roles/kube-prometheus-stack/defaults/main.yml
+++ b/ansible/roles/kube-prometheus-stack/defaults/main.yml
@@ -65,3 +65,8 @@ kube_prometheus_stack:
               resources:
                 requests:
                   storage: 6Gi
+    prometheusOperator:
+      admissionWebhooks:
+        patch:
+          image:
+            sha: ''
diff --git a/ansible/roles/kube-prometheus-stack/molecule/default/tests/test_default.py b/ansible/roles/kube-prometheus-stack/molecule/default/tests/test_default.py
index 18da24e8..0717eb37 100644
--- a/ansible/roles/kube-prometheus-stack/molecule/default/tests/test_default.py
+++ b/ansible/roles/kube-prometheus-stack/molecule/default/tests/test_default.py
@@ -3,7 +3,7 @@ import yaml
 
 def test_prometheus_helm_package(host):
     assert host.file('/opt/onap/downloads/'
-                     'kube-prometheus-stack-18.0.4.tgz').exists
+                     'kube-prometheus-stack-32.2.1.tgz').exists
 
 
 def test_helm_values_file(host):
diff --git a/ansible/test/bin/install-molecule.sh b/ansible/test/bin/install-molecule.sh
index 87de8d85..d18f70f7 100755
--- a/ansible/test/bin/install-molecule.sh
+++ b/ansible/test/bin/install-molecule.sh
@@ -42,5 +42,5 @@ source ${VENV_PATH}/bin/activate
 if [ ! -z ${VIRTUAL_ENV} ]; then
     echo "Activated virtual env in ${VIRTUAL_ENV}"
     pip -q install -U pip
-    pip -q install molecule==3.3.0 Jinja2==2.11.3 ansible-base==2.10.8 ansible==3.2.0 docker molecule-docker==0.2.4 pytest-testinfra yamllint flake8
+    pip -q install molecule==3.3.0 Jinja2==2.11.3 ansible-base==2.10.8 ansible==3.2.0 docker molecule-docker==0.2.4 pytest-testinfra yamllint flake8 markupsafe==2.0.1
 fi
diff --git a/build/data_lists/kube_prometheus_stack_docker_images.list b/build/data_lists/kube_prometheus_stack_docker_images.list
index 2b5efecc..18386d53 100644
--- a/build/data_lists/kube_prometheus_stack_docker_images.list
+++ b/build/data_lists/kube_prometheus_stack_docker_images.list
@@ -1,10 +1,10 @@
-quay.io/prometheus-operator/prometheus-config-reloader:v0.50.0
-quay.io/prometheus-operator/prometheus-operator:v0.50.0
-quay.io/prometheus/alertmanager:v0.22.2
-quay.io/prometheus/prometheus:v2.28.1
-grafana/grafana:8.1.0
-k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.1.1
-jettech/kube-webhook-certgen:v1.5.2
-quay.io/kiwigrid/k8s-sidecar:1.12.2
-quay.io/prometheus/node-exporter:v1.2.2
+quay.io/prometheus-operator/prometheus-config-reloader:v0.54.0
+quay.io/prometheus-operator/prometheus-operator:v0.54.0
+quay.io/prometheus/alertmanager:v0.23.0
+quay.io/prometheus/prometheus:v2.33.1
+grafana/grafana:8.3.5
+k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.3.0
+k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0
+quay.io/kiwigrid/k8s-sidecar:1.15.1
+quay.io/prometheus/node-exporter:v1.3.1
 busybox:1.31.1
diff --git a/build/data_lists/kube_prometheus_stack_http.list b/build/data_lists/kube_prometheus_stack_http.list
index ddc5841a..beb67ec5 100644
--- a/build/data_lists/kube_prometheus_stack_http.list
+++ b/build/data_lists/kube_prometheus_stack_http.list
@@ -1 +1 @@
-https://github.com/prometheus-community/helm-charts/releases/download/kube-prometheus-stack-18.0.4/kube-prometheus-stack-18.0.4.tgz
+https://github.com/prometheus-community/helm-charts/releases/download/kube-prometheus-stack-32.2.1/kube-prometheus-stack-32.2.1.tgz
diff --git a/patches/MARIADB-Use-common-labels-for-the-metrics-Service-selector.patch b/patches/MARIADB-Use-common-labels-for-the-metrics-Service-selector.patch
deleted file mode 100644
index a0696f43..00000000
--- a/patches/MARIADB-Use-common-labels-for-the-metrics-Service-selector.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a9d2af7ba6ec8d2c43ff21089869ae835954c90f Mon Sep 17 00:00:00 2001
-From: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
-Date: Fri, 4 Feb 2022 14:19:51 +0100
-Subject: [PATCH] [MARIADB] Use common labels for the metrics Service selector
-
-Setting the "prometheus: kube-prometheus" label selector for mariadb-galera
-ServiceMonitor object is invalid since mariadb-galera-metrics service has
-common labels assigned.
-
-Without this change Prometheus (in kube-prometheus-stack) does not select
-the mariadb-galera-metrics service for scraping and relevant target is
-not created.
-
-Change-Id: I64dfe83ff7fb448125f8726cf3ca33048ced04a8
-Issue-ID: OOM-2925
-Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
----
- kubernetes/common/mariadb-galera/values.yaml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/kubernetes/common/mariadb-galera/values.yaml b/kubernetes/common/mariadb-galera/values.yaml
-index f49a89881..9f7c88213 100644
---- a/kubernetes/common/mariadb-galera/values.yaml
-+++ b/kubernetes/common/mariadb-galera/values.yaml
-@@ -608,8 +608,8 @@ metrics:
-     ## ServiceMonitor selector labels
-     ## ref: https://github.com/bitnami/charts/tree/master/bitnami/prometheus-operator#prometheus-configuration
-     ##
--    selector:
--      prometheus: kube-prometheus
-+    # selector:
-+    #   prometheus: kube-prometheus
-
-     ## RelabelConfigs to apply to samples before scraping
-     ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
---
-2.17.1