Merge branch 'owls-130071' into 'release/4.2'

fix introspector initContainer not added for legacy domain on pv.

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

(cherry picked from commit db82107)

affffc8 fix introspector initContainer not added for legacy domain on pv.

Co-authored-by: Ryan Eberhard <[email protected]>

Author: rjeberhard

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

@@ -474,22 +474,28 @@ protected void addInitContainers(V1PodSpec podSpec) {
     getInitializeDomainOnPV().ifPresent(initializeDomainOnPV -> addInitDomainOnPVInitContainer(initContainers));
     Optional.ofNullable(getAuxiliaryImages()).ifPresent(auxImages -> addInitContainers(initContainers, auxImages));
     Optional.ofNullable(getDomainCreationImages()).ifPresent(dcrImages -> addInitContainers(initContainers, dcrImages));
-    initContainers.addAll(getAdditionalInitContainers().stream()
-            .filter(container -> isAllowedInIntrospector(container.getName()))
-            .map(c -> c.env(createEnv(c)).envFrom(c.getEnvFrom()).resources(createResources()))
-            .toList());
+    List<V1Container> introspectorInitContainers = getIntrospectorInitContainers();
+    if (introspectorInitContainers.isEmpty()) {
+      initContainers.addAll(getAdditionalInitContainers().stream()
+              .filter(container -> isAllowedInIntrospector(container.getName()))
+              .map(c -> c.env(createEnv(c)).envFrom(c.getEnvFrom()).resources(createResources()))
+              .toList());
+    } else {
+      for (V1Container initContainer : introspectorInitContainers) {
+        if (initContainers.stream().noneMatch(
+                container -> container.getName().equals(initContainer.getName()))) {
+          initContainer.securityContext(getInitContainerSecurityContext());
+          initContainers.add(initContainer);
+        }
+      }
+    }
     podSpec.initContainers(initContainers);
   }
 
   private void addInitContainers(List<V1Container> initContainers, List<? extends DeploymentImage> auxiliaryImages) {
     IntStream.range(0, auxiliaryImages.size()).forEach(idx ->
-        initContainers.add(createInitContainerForAuxiliaryImage(auxiliaryImages.get(idx), idx,
-                isInitializeDomainOnPV())));
-    List<V1Container> introspectorInitContainers = getIntrospectorInitContainers();
-    for (V1Container initContainer : introspectorInitContainers) {
-      initContainer.securityContext(getInitContainerSecurityContext());
-      initContainers.add(initContainer);
-    }
+            initContainers.add(createInitContainerForAuxiliaryImage(auxiliaryImages.get(idx), idx,
+                    isInitializeDomainOnPV())));
   }
 
   private Optional<InitializeDomainOnPV> getInitializeDomainOnPV() {