Merge branch 'revert-5076b716' into 'main'

Revert "Merge branch 'fix-initcontainer-not-setting-adminspec-volume' into 'main'"

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

Author: rjeberhard

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

@@ -482,6 +482,7 @@ private void addInitDomainOnPVInitContainer(List<V1Container> initContainers) {
     initContainers.add(new V1Container()
         .name(INIT_DOMAIN_ON_PV_CONTAINER)
         .image(getDomain().getSpec().getImage())
+        .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))

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

@@ -1568,6 +1568,7 @@ void introspectorPodSpec_createdWithInitDomainOnPVInitContainerHasCorrectVolumeM
         .withLogHome("/share/logs/domain1")
         .withDomainHomeSourceType(DomainSourceType.PERSISTENT_VOLUME)
         .withAdditionalVolume("volume1", VOLUME_PATH_1)
+        .withAdditionalVolumeMount("volume1Mount", VOLUME_MOUNT_PATH_1)
         .withInitializeDomainOnPV(new InitializeDomainOnPV()
             .domain(new DomainOnPV().createMode(CreateIfNotExists.DOMAIN_AND_RCU)
                 .domainType(JRF)
@@ -1584,7 +1585,7 @@ void introspectorPodSpec_createdWithInitDomainOnPVInitContainerHasCorrectVolumeM
             .map(V1Container::getVolumeMounts).orElse(Collections.emptyList()).stream()
             .map(V1VolumeMount::getMountPath)
             .collect(Collectors.toList()),
-          hasItems(SCRIPTS_MOUNTS_PATH, "/tmpAuxiliaryImage"));
+          hasItems(SCRIPTS_MOUNTS_PATH, "/tmpAuxiliaryImage", VOLUME_MOUNT_PATH_1));
 
   }