Skip to content

Commit 00975c5

Browse files
committed
Revert "Merge branch 'fix-initcontainer-not-setting-adminspec-volume' into 'main'"
1 parent 1ca2ae8 commit 00975c5

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,7 @@ 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())
485486
.addVolumeMountsItem(new V1VolumeMount().name(SCRIPTS_VOLUME).mountPath(SCRIPTS_MOUNTS_PATH))
486487
.addVolumeMountsItem(new V1VolumeMount().name(AUXILIARY_IMAGE_INTERNAL_VOLUME_NAME)
487488
.mountPath(AUXILIARY_IMAGE_TARGET_PATH))

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1568,6 +1568,7 @@ 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)
15711572
.withInitializeDomainOnPV(new InitializeDomainOnPV()
15721573
.domain(new DomainOnPV().createMode(CreateIfNotExists.DOMAIN_AND_RCU)
15731574
.domainType(JRF)
@@ -1584,7 +1585,7 @@ void introspectorPodSpec_createdWithInitDomainOnPVInitContainerHasCorrectVolumeM
15841585
.map(V1Container::getVolumeMounts).orElse(Collections.emptyList()).stream()
15851586
.map(V1VolumeMount::getMountPath)
15861587
.collect(Collectors.toList()),
1587-
hasItems(SCRIPTS_MOUNTS_PATH, "/tmpAuxiliaryImage"));
1588+
hasItems(SCRIPTS_MOUNTS_PATH, "/tmpAuxiliaryImage", VOLUME_MOUNT_PATH_1));
15881589

15891590
}
15901591

0 commit comments

Comments
 (0)