Skip to content

Commit 8b0dfe3

Browse files
jshum2479rjeberhard
authored andcommitted
Test EU commission fix and integration test fix
1 parent 7bc8b04 commit 8b0dfe3

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/PersistentVolumeUtils.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.nio.file.Files;
99
import java.nio.file.Path;
1010
import java.nio.file.Paths;
11+
import java.nio.file.attribute.PosixFilePermissions;
1112
import java.util.Arrays;
1213
import java.util.HashMap;
1314
import java.util.Random;
@@ -253,6 +254,17 @@ public static Path createPVHostPathDir(String pvName, String className) {
253254
logger.info("Creating PV directory host path {0}", pvHostPath);
254255
deleteDirectory(pvHostPath.toFile());
255256
createDirectories(pvHostPath);
257+
Path p = pvHostPath;
258+
while (true) {
259+
Files.setPosixFilePermissions(p,PosixFilePermissions.fromString("rwxrwxrwx"));
260+
p = p.getParent();
261+
if (p == null) {
262+
break;
263+
}
264+
if (p.toAbsolutePath().toString().equals(PV_ROOT)) {
265+
break;
266+
}
267+
}
256268
} catch (IOException ioex) {
257269
logger.severe(ioex.getMessage());
258270
fail("Create persistent volume host path failed");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +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())
485+
.volumeMounts(getDomain().getSpec().getAdditionalVolumeMounts())
486486
.addVolumeMountsItem(new V1VolumeMount().name(SCRIPTS_VOLUME).mountPath(SCRIPTS_MOUNTS_PATH))
487487
.addVolumeMountsItem(new V1VolumeMount().name(AUXILIARY_IMAGE_INTERNAL_VOLUME_NAME)
488488
.mountPath(AUXILIARY_IMAGE_TARGET_PATH))

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1568,7 +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)
1571+
.withAdditionalVolumeMount("dhmountpoint", "/share")
15721572
.withInitializeDomainOnPV(new InitializeDomainOnPV()
15731573
.domain(new DomainOnPV().createMode(CreateIfNotExists.DOMAIN_AND_RCU)
15741574
.domainType(JRF)
@@ -1585,7 +1585,7 @@ void introspectorPodSpec_createdWithInitDomainOnPVInitContainerHasCorrectVolumeM
15851585
.map(V1Container::getVolumeMounts).orElse(Collections.emptyList()).stream()
15861586
.map(V1VolumeMount::getMountPath)
15871587
.collect(Collectors.toList()),
1588-
hasItems(SCRIPTS_MOUNTS_PATH, "/tmpAuxiliaryImage", VOLUME_MOUNT_PATH_1));
1588+
hasItems(SCRIPTS_MOUNTS_PATH, "/share"));
15891589

15901590
}
15911591

0 commit comments

Comments
 (0)