Merge branch 'userfix' into 'main'

changed security context for prometheus and Grafana servers to avoid creation of pv files with root ownership

See merge request weblogic-cloud/weblogic-kubernetes-operator!4261

Author: rjeberhard

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMonitoringExporterMetricsFiltering.java

@@ -112,7 +112,7 @@ class ItMonitoringExporterMetricsFiltering {
   private static Map<String, Integer> clusterNameMsPortMap;
   private static LoggingFacade logger = null;
   private static List<String> clusterNames = new ArrayList<>();
-  private static String releaseSuffix = "test2";
+  private static String releaseSuffix = "testfilter";
   private static String prometheusReleaseName = "prometheus" + releaseSuffix;
   private static String grafanaReleaseName = "grafana" + releaseSuffix;
   private static  String monitoringExporterDir;

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMonitoringExporterSamples.java

@@ -154,7 +154,7 @@ class ItMonitoringExporterSamples {
   private static Map<String, Integer> clusterNameMsPortMap;
   private static LoggingFacade logger = null;
   private static List<String> clusterNames = new ArrayList<>();
-  private static String releaseSuffix = "test3";
+  private static String releaseSuffix = "testsamples";
   private static String prometheusReleaseName = "prometheus" + releaseSuffix;
   private static String grafanaReleaseName = "grafana" + releaseSuffix;
   private static  String monitoringExporterDir;

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMonitoringExporterWebApp.java

@@ -130,7 +130,7 @@ class ItMonitoringExporterWebApp {
   private static Map<String, Integer> clusterNameMsPortMap;
   private static LoggingFacade logger = null;
   private static List<String> clusterNames = new ArrayList<>();
-  private static String releaseSuffix = "test2";
+  private static String releaseSuffix = "testwebapp";
   private static String prometheusReleaseName = "prometheus" + releaseSuffix;
   private static String grafanaReleaseName = "grafana" + releaseSuffix;
   private static  String monitoringExporterDir;

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/MonitoringUtils.java

@@ -668,6 +668,9 @@ public static void cleanupPromGrafanaClusterRoles(String prometheusReleaseName,
       if (ClusterRole.clusterRoleExists(prometheusReleaseName + "-kube-state-metrics")) {
         Kubernetes.deleteClusterRole(prometheusReleaseName + "-kube-state-metrics");
       }
+      if (ClusterRole.clusterRoleExists(prometheusReleaseName + "-pushgateway")) {
+        Kubernetes.deleteClusterRole(prometheusReleaseName + "-pushgateway");
+      }
       if (ClusterRole.clusterRoleExists(prometheusReleaseName + "-server")) {
         Kubernetes.deleteClusterRole(prometheusReleaseName + "-server");
       }
@@ -686,6 +689,9 @@ public static void cleanupPromGrafanaClusterRoles(String prometheusReleaseName,
       if (ClusterRoleBinding.clusterRoleBindingExists(prometheusReleaseName + "-kube-state-metrics")) {
         Kubernetes.deleteClusterRoleBinding(prometheusReleaseName + "-kube-state-metrics");
       }
+      if (ClusterRoleBinding.clusterRoleBindingExists(prometheusReleaseName + "-pushgateway")) {
+        Kubernetes.deleteClusterRoleBinding(prometheusReleaseName + "-pushgateway");
+      }
       if (ClusterRoleBinding.clusterRoleBindingExists(prometheusReleaseName + "-server")) {
         Kubernetes.deleteClusterRoleBinding(prometheusReleaseName + "-server");
       }

integration-tests/src/test/resources/exporter/grafanavalues.yaml

@@ -31,6 +31,6 @@ initChownData:
     pullPolicy: IfNotPresent
 
 securityContext:
-  fsGroup: 0
-  runAsGroup: 0
-  runAsUser: 0
+  fsGroup: 1000
+  runAsGroup: 1000
+  runAsUser: 1000

integration-tests/src/test/resources/exporter/promvalues.yaml

@@ -26,9 +26,9 @@ alertmanager:
     tag: prometheus_alertmanager_tag
     pullPolicy: IfNotPresent
   securityContext:
-    runAsUser: 65534
+    runAsUser: 1000
     runAsNonRoot: true
-    runAsGroup: 65534
+    runAsGroup: 1000
 
 #nodeExporter:
 prometheus-node-exporter:
@@ -66,8 +66,9 @@ server:
     type: NodePort
     nodePort: 30500
   securityContext:
-    runAsUser: 0
-    runAsNonRoot: false
+    runAsGroup: 65534
+    runAsNonRoot: true
+    runAsUser: 1000
 
   global:
     evaluation_interval: 1m