Merge branch 'metrics-jdk-options' into 'main'

Prepare for future release of WME by switching Java options env. variable

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

Author: rjeberhard

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

@@ -1361,7 +1361,7 @@ public static boolean verifyMonExpAppAccess(String uri, String searchKey, Boolea
     }
     // access metrics
     final String command = String.format(
-        "%s exec -n %s %s -- curl -k %s://%s:%s@%s:%s/%s",
+        "%s exec -c weblogic-server -n %s %s -- curl -k %s://%s:%s@%s:%s/%s",
         KUBERNETES_CLI,
         domainNS,
         podName,
@@ -1446,7 +1446,8 @@ public static String replaceValueInFile(String tempFileName, String srcFileName,
   public static boolean verifyMonExpAppAccessSideCar(String searchKey,
                                               String domainNS, String podName) {
     // access metrics
-    final String command = String.format("%s exec -n %s %s -- curl -X GET -u %s:%s http://localhost:8080/metrics",
+    final String command = String.format(
+        "%s exec -c weblogic-server -n %s %s -- curl -X GET -u %s:%s http://localhost:8080/metrics",
         KUBERNETES_CLI, domainNS, podName, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT);
 
     logger.info("accessing managed server exporter via " + command);

operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java

@@ -1270,6 +1270,13 @@ private void restoreMetricsExporterSidecarPortTcpMetrics(V1Pod recipe, V1Pod cur
               .findFirst()).ifPresent(p -> p.setName("tcp-metrics"));
     }
 
+    private void restoreMetricsExporterSidecarJavaOpts(V1Pod recipe, V1Pod currentPod) {
+      V1PodSpec podSpec = recipe.getSpec();
+      stream(podSpec.getContainers()).filter(c -> "monitoring-exporter".equals(c.getName()))
+          .findFirst().flatMap(c -> stream(c.getEnv()).filter(p -> "JDK_JAVA_OPTIONS".equals(p.getName()))
+              .findFirst()).ifPresent(p -> p.setName("JAVA_OPTS"));
+    }
+
     private void restoreLegacyIstioPortsConfig(V1Pod recipePod,  V1Pod currentPod) {
       V1PodSpec recipePodSpec = recipePod.getSpec();
 
@@ -1416,6 +1423,7 @@ private boolean canAdjustRecentOperatorMajorVersion3HashToMatch(V1Pod currentPod
       // return true if any adjusted hash matches required hash
       List<Pair<String, BiConsumer<V1Pod, V1Pod>>> adjustments = List.of(
           Pair.of("restoreMetricsExporterSidecarPortTcpMetrics", this::restoreMetricsExporterSidecarPortTcpMetrics),
+          Pair.of("restoreMetricsExporterSidecarJavaOpts", this::restoreMetricsExporterSidecarJavaOpts),
           Pair.of("convertAuxImagesInitContainerVolumeAndMounts",
               this::convertAuxImagesInitContainerVolumeAndMounts),
           Pair.of("restoreLegacyIstioPortsConfig", this::restoreLegacyIstioPortsConfig),
@@ -1662,7 +1670,7 @@ private V1Container createMonitoringExporterContainer() {
             .imagePullPolicy(getDomain().getMonitoringExporterImagePullPolicy())
             .resources(getDomain().getMonitoringExporterResources())
             .securityContext(getServerSpec().getContainerSecurityContext())
-            .addEnvItem(new V1EnvVar().name("JAVA_OPTS").value(createJavaOptions()))
+            .addEnvItem(new V1EnvVar().name("JDK_JAVA_OPTIONS").value(createJavaOptions()))
             .addPortsItem(new V1ContainerPort()
                 .name("metrics").protocol("TCP").containerPort(getPort()));
 

operator/src/test/java/oracle/kubernetes/operator/helpers/ManagedPodHelperTest.java

@@ -1391,7 +1391,7 @@ protected boolean matchesSafely(V1Container container, Description mismatchDescr
       if (getJavaOptions(container).contains(expectedOption)) {
         return true;
       } else {
-        mismatchDescription.appendText("JAVA_OPTS is ").appendValue(getJavaOptEnv(container));
+        mismatchDescription.appendText("JDK_JAVA_OPTIONS is ").appendValue(getJavaOptEnv(container));
         return false;
       }
     }
@@ -1406,7 +1406,7 @@ private List<String> getJavaOptions(V1Container container) {
     @Nonnull
     private String getJavaOptEnv(V1Container container) {
       return getEnvironmentVariables(container).stream()
-            .filter(env -> "JAVA_OPTS".equals(env.getName()))
+            .filter(env -> "JDK_JAVA_OPTIONS".equals(env.getName()))
             .map(V1EnvVar::getValue)
             .findFirst()
             .orElse("");
@@ -1419,7 +1419,7 @@ private List<V1EnvVar> getEnvironmentVariables(V1Container container) {
 
     @Override
     public void describeTo(Description description) {
-      description.appendText("JAVA_OPTS containing ").appendValue(expectedOption);
+      description.appendText("JDK_JAVA_OPTIONS containing ").appendValue(expectedOption);
     }
   }