Merge branch 'owls-116638-fix-duplicate-volumes-added' into 'main'

Fix duplicate volumes are added if using server pod spec in initcontainer,...

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

(cherry picked from commit d57345f)

e470a9e Fix duplicate volumes are added if using server pod spec in initcontainer,...
dd60389 remove debug logging
21b6bc7 remove whenAdminServerHasNormalAdditionalVolume_introspectorPodStartupWithoutThem test.
eca57ff style fix

Author: rjeberhard

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

@@ -482,7 +482,7 @@ private void addInitDomainOnPVInitContainer(List<V1Container> initContainers) {
     initContainers.add(new V1Container()
         .name(INIT_DOMAIN_ON_PV_CONTAINER)
         .image(getDomain().getSpec().getImage())
-        .volumeMounts(getDomain().getSpec().getAdditionalVolumeMounts())
+        .volumeMounts(getDomain().getAdminServerSpec().getAdditionalVolumeMounts())
         .addVolumeMountsItem(new V1VolumeMount().name(SCRIPTS_VOLUME).mountPath(SCRIPTS_MOUNTS_PATH))
         .addVolumeMountsItem(new V1VolumeMount().name(AUXILIARY_IMAGE_INTERNAL_VOLUME_NAME)
             .mountPath(AUXILIARY_IMAGE_TARGET_PATH))
@@ -600,6 +600,15 @@ protected V1PodSpec createPodSpec() {
       podSpec.addVolumesItem(additionalVolume);
     }
 
+    for (V1Volume additionalVolume : info.getDomain().getAdminServerSpec().getAdditionalVolumes()) {
+      if (podSpec.getVolumes() != null) {
+        List<V1Volume> volumes = podSpec.getVolumes();
+        if (!volumes.contains(additionalVolume) && !additionalVolume.getName().startsWith(COMPATIBILITY_MODE)) {
+          volumes.add(additionalVolume);
+        }
+      }
+    }
+
     getConfigOverrideSecrets().forEach(secretName -> addConfigOverrideSecretVolume(podSpec, secretName));
     Optional.ofNullable(getConfigOverrides()).ifPresent(overrides -> addConfigOverrideVolume(podSpec, overrides));
 

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

@@ -1707,17 +1707,6 @@ void whenAdminServerHasNormalInitContainers_introspectorPodStartupWithoutThem()
     assertThat(getNumPodSpecInitContainers(jobSpec), equalTo(0));
   }
 
-  @Test
-  void whenAdminServerHasNormalAdditionalVolume_introspectorPodStartupWithoutThem() {
-    configureDomain()
-          .configureAdminServer()
-          .withAdditionalVolume("Test", "/test");
-
-    V1JobSpec jobSpec = createJobSpec();
-
-    assertThat(getNumPodSpecVolumes(jobSpec), equalTo(3));
-  }
-
   private int getNumPodSpecVolumes(V1JobSpec jobSpec) {
     return getPodSpecListSize(jobSpec, V1PodSpec::getVolumes);
   }