Enable UWM in OpenShift test clusters

Author: czeslavo

hack/.ci/manifests/namespaces/openshift-monitoring/openshift-uwm.cm.yaml

@@ -0,0 +1,10 @@
+# This ConfigMap enables User Workload Monitoring in OpenShift clusters.
+# See https://docs.redhat.com/en/documentation/openshift_container_platform/4.18/html/monitoring/configuring-user-workload-monitoring#enabling-monitoring-for-user-defined-projects_preparing-to-configure-the-monitoring-stack-uwm.
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cluster-monitoring-config
+  namespace: openshift-monitoring
+data:
+  config.yaml: |
+    enableUserWorkload: true

hack/.ci/run-e2e-openshift-aws-release.sh

@@ -36,6 +36,9 @@ export SO_NODECONFIG_PATH
 SO_DISABLE_PROMETHEUS_OPERATOR="${SO_DISABLE_PROMETHEUS_OPERATOR:-true}"
 export SO_DISABLE_PROMETHEUS_OPERATOR
 
+SO_ENABLE_OPENSHIFT_USER_WORKLOAD_MONITORING="${SO_ENABLE_OPENSHIFT_USER_WORKLOAD_MONITORING:-true}"
+export SO_ENABLE_OPENSHIFT_USER_WORKLOAD_MONITORING
+
 run-deploy-script-in-all-clusters "${parent_dir}/../ci-deploy-release.sh"
 
 apply-e2e-workarounds-in-all-clusters

hack/.ci/run-e2e-openshift-aws.sh

@@ -39,6 +39,9 @@ export SO_CSI_DRIVER_PATH
 SO_DISABLE_PROMETHEUS_OPERATOR="${SO_DISABLE_PROMETHEUS_OPERATOR:-true}"
 export SO_DISABLE_PROMETHEUS_OPERATOR
 
+SO_ENABLE_OPENSHIFT_USER_WORKLOAD_MONITORING="${SO_ENABLE_OPENSHIFT_USER_WORKLOAD_MONITORING:-true}"
+export SO_ENABLE_OPENSHIFT_USER_WORKLOAD_MONITORING
+
 run-deploy-script-in-all-clusters "${parent_dir}/../ci-deploy.sh"
 
 apply-e2e-workarounds-in-all-clusters

hack/ci-deploy-release.sh

@@ -58,6 +58,13 @@ else
   kubectl_create -n=prometheus-operator -f="${source_url}/${revision}/examples/third-party/prometheus-operator.yaml"
 fi
 
+if [[ "${SO_ENABLE_OPENSHIFT_USER_WORKLOAD_MONITORING:-}" == "true" ]]; then
+  echo "Enabling OpenShift User Workload Monitoring"
+  kubectl_create -f="${source_url}/${revision}/hack/.ci/manifests/namespaces/openshift-monitoring/openshift-uwm.cm.yaml"
+else
+  echo "Skipping enabling OpenShift User Workload Monitoring"
+fi
+
 kubectl_create -n=haproxy-ingress -f="${source_url}/${revision}/examples/third-party/haproxy-ingress.yaml"
 
 kubectl_create -f="${source_url}/${revision}/examples/third-party/cert-manager.yaml"

hack/ci-deploy.sh

@@ -42,6 +42,13 @@ else
   cp ./examples/third-party/prometheus-operator/*.yaml "${ARTIFACTS_DEPLOY_DIR}/prometheus-operator"
 fi
 
+if [[ "${SO_ENABLE_OPENSHIFT_USER_WORKLOAD_MONITORING:-}" == "true" ]]; then
+  echo "Enabling OpenShift User Workload Monitoring"
+  cp ./hack/.ci/manifests/namespaces/openshift-monitoring/openshift-uwm.cm.yaml "${ARTIFACTS_DEPLOY_DIR}/"
+else
+  echo "Skipping enabling OpenShift User Workload Monitoring"
+fi
+
 cp ./deploy/operator/*.yaml "${ARTIFACTS_DEPLOY_DIR}/operator"
 cp ./examples/third-party/haproxy-ingress/*.yaml "${ARTIFACTS_DEPLOY_DIR}/haproxy-ingress"
 cp ./examples/third-party/cert-manager.yaml "${ARTIFACTS_DEPLOY_DIR}/"