Skip to content

Commit 5076b71

Browse files
committed
Merge branch 'fix-initcontainer-not-setting-adminspec-volume' into 'main'
remove unnecessary volume mount for specific dopv init dh container See merge request weblogic-cloud/weblogic-kubernetes-operator!4600
2 parents 189cd7e + 5802333 commit 5076b71

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,6 @@ private void addInitDomainOnPVInitContainer(List<V1Container> initContainers) {
482482
initContainers.add(new V1Container()
483483
.name(INIT_DOMAIN_ON_PV_CONTAINER)
484484
.image(getDomain().getSpec().getImage())
485-
.volumeMounts(getDomain().getAdminServerSpec().getAdditionalVolumeMounts())
486485
.addVolumeMountsItem(new V1VolumeMount().name(SCRIPTS_VOLUME).mountPath(SCRIPTS_MOUNTS_PATH))
487486
.addVolumeMountsItem(new V1VolumeMount().name(AUXILIARY_IMAGE_INTERNAL_VOLUME_NAME)
488487
.mountPath(AUXILIARY_IMAGE_TARGET_PATH))

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1568,7 +1568,6 @@ void introspectorPodSpec_createdWithInitDomainOnPVInitContainerHasCorrectVolumeM
15681568
.withLogHome("/share/logs/domain1")
15691569
.withDomainHomeSourceType(DomainSourceType.PERSISTENT_VOLUME)
15701570
.withAdditionalVolume("volume1", VOLUME_PATH_1)
1571-
.withAdditionalVolumeMount("volume1Mount", VOLUME_MOUNT_PATH_1)
15721571
.withInitializeDomainOnPV(new InitializeDomainOnPV()
15731572
.domain(new DomainOnPV().createMode(CreateIfNotExists.DOMAIN_AND_RCU)
15741573
.domainType(JRF)
@@ -1585,7 +1584,7 @@ void introspectorPodSpec_createdWithInitDomainOnPVInitContainerHasCorrectVolumeM
15851584
.map(V1Container::getVolumeMounts).orElse(Collections.emptyList()).stream()
15861585
.map(V1VolumeMount::getMountPath)
15871586
.collect(Collectors.toList()),
1588-
hasItems(SCRIPTS_MOUNTS_PATH, "/tmpAuxiliaryImage", VOLUME_MOUNT_PATH_1));
1587+
hasItems(SCRIPTS_MOUNTS_PATH, "/tmpAuxiliaryImage"));
15891588

15901589
}
15911590

0 commit comments

Comments
 (0)