Merge branch 'add-podname-to-wmesidecar' into 'main'

passing pod name to the system property of wme side car, so that it can display the instance name in metrics

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

Author: rjeberhard

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

@@ -1275,6 +1275,34 @@ private void restoreMetricsExporterSidecarJavaOpts(V1Pod recipe, V1Pod currentPo
       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 removePodNameJavaOpt(V1Pod recipe, V1Pod currentPod) {
+      V1PodSpec podSpec = recipe.getSpec();
+
+      stream(podSpec.getContainers())
+              .filter(c -> "monitoring-exporter".equals(c.getName()))
+              .findFirst()
+              .ifPresent(container -> {
+
+                // find the JDK_JAVA_OPTIONS env var
+                stream(container.getEnv())
+                        .filter(env -> "JDK_JAVA_OPTIONS".equals(env.getName()))
+                        .findFirst()
+                        .ifPresent(envVar -> {
+                          String original = envVar.getValue();
+                          if (original == null) {
+                            return;
+                          }
+
+                          // remove `-DPOD_NAME=<whatever>` (and surrounding spaces)
+                          String cleaned = original.replaceAll("\\s*-DPOD_NAME=\\S+", "")
+                                  .trim()
+                                  .replaceAll(" +", " "); // collapse double spaces
+                          envVar.setValue(cleaned);
+                        });
+              });
     }
 
     private void restoreLegacyIstioPortsConfig(V1Pod recipePod,  V1Pod currentPod) {
@@ -1423,6 +1451,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("removePodNameJavaOpt", this::removePodNameJavaOpt),
           Pair.of("restoreMetricsExporterSidecarJavaOpts", this::restoreMetricsExporterSidecarJavaOpts),
           Pair.of("convertAuxImagesInitContainerVolumeAndMounts",
               this::convertAuxImagesInitContainerVolumeAndMounts),
@@ -1685,6 +1714,7 @@ private String createJavaOptions() {
       final List<String> args = new ArrayList<>();
       args.add("-DDOMAIN=" + getDomainUid());
       args.add("-DWLS_PORT=" + getWebLogicRestPort());
+      args.add("-DPOD_NAME=" + getPodName());
       if (isWebLogicSecure()) {
         args.add("-DWLS_SECURE=true");
       }