Skip to content

Commit b6e3b86

Browse files
committed
minor code cleanup and unit tests
1 parent a37b440 commit b6e3b86

File tree

4 files changed

+31
-3
lines changed

4 files changed

+31
-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
@@ -241,7 +241,6 @@ private V1Container createContainer(TuningParameters tuningParameters) {
241241
.imagePullPolicy(getImagePullPolicy())
242242
.command(getContainerCommand())
243243
.env(getEnvironmentVariables(tuningParameters))
244-
// .addVolumeMountsItem(volumeMount(STORAGE_VOLUME, STORAGE_MOUNT_PATH))
245244
.addVolumeMountsItem(readOnlyVolumeMount(SECRETS_VOLUME, SECRETS_MOUNT_PATH))
246245
.addVolumeMountsItem(readOnlyVolumeMount(SCRIPTS_VOLUME, SCRIPTS_MOUNTS_PATH));
247246

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,6 @@ private V1Container createContainer(TuningParameters tuningParameters) {
637637
.env(getEnvironmentVariables(tuningParameters))
638638
.addPortsItem(new V1ContainerPort().containerPort(getPort()).protocol("TCP"))
639639
.lifecycle(createLifecycle())
640-
// .addVolumeMountsItem(volumeMount(STORAGE_VOLUME, STORAGE_MOUNT_PATH))
641640
.addVolumeMountsItem(readOnlyVolumeMount(SECRETS_VOLUME, SECRETS_MOUNT_PATH))
642641
.addVolumeMountsItem(readOnlyVolumeMount(SCRIPTS_VOLUME, SCRIPTS_MOUNTS_PATH))
643642
.addVolumeMountsItem(readOnlyVolumeMount(DEBUG_CM_VOLUME, DEBUG_CM_MOUNTS_PATH))

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

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,12 @@ public void whenJobCreated_specHasOneContainer() {
225225
assertThat(getCreatedJob().getSpec().getTemplate().getSpec().getContainers(), hasSize(1));
226226
}
227227

228-
// @Test
228+
@Test
229229
public void whenJobCreated_containerHasExpectedVolumeMounts() {
230+
domainPresenceInfo
231+
.getClaims()
232+
.addItemsItem(
233+
new V1PersistentVolumeClaim().metadata(new V1ObjectMeta().name("claim-name")));
230234
assertThat(
231235
getCreatedJobSpecContainer().getVolumeMounts(),
232236
containsInAnyOrder(
@@ -238,6 +242,19 @@ public void whenJobCreated_containerHasExpectedVolumeMounts() {
238242
readOnlyVolumeMount(OVERRIDE_SECRET_2 + "-volume", OVERRIDE_SECRETS_MOUNT_PATH)));
239243
}
240244

245+
@Test
246+
public void whenJobCreated_withNoPVC_containerHasExpectedVolumeMounts() {
247+
domainPresenceInfo.getClaims().getItems().clear();
248+
assertThat(
249+
getCreatedJobSpecContainer().getVolumeMounts(),
250+
containsInAnyOrder(
251+
readOnlyVolumeMount(SECRETS_VOLUME, SECRETS_MOUNT_PATH),
252+
readOnlyVolumeMount(SCRIPTS_VOLUME, SCRIPTS_MOUNTS_PATH),
253+
readOnlyVolumeMount(OVERRIDES_CM + "-volume", OVERRIDES_CM_MOUNT_PATH),
254+
readOnlyVolumeMount(OVERRIDE_SECRET_1 + "-volume", OVERRIDE_SECRETS_MOUNT_PATH),
255+
readOnlyVolumeMount(OVERRIDE_SECRET_2 + "-volume", OVERRIDE_SECRETS_MOUNT_PATH)));
256+
}
257+
241258
@SuppressWarnings("unchecked")
242259
@Test
243260
public void whenJobCreated_hasPredefinedEnvVariables() {

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,19 @@ public void whenPodCreated_containerHasExpectedVolumeMounts() {
273273
readOnlyVolumeMount("weblogic-domain-cm-volume", "/weblogic-operator/scripts")));
274274
}
275275

276+
@Test
277+
public void whenPodCreated_withNoPVC_containerHasExpectedVolumeMounts() {
278+
domainPresenceInfo.getClaims().getItems().clear();
279+
assertThat(
280+
getCreatedPodSpecContainer().getVolumeMounts(),
281+
containsInAnyOrder(
282+
writableVolumeMount(
283+
UID + SIT_CONFIG_MAP_VOLUME_SUFFIX, "/weblogic-operator/introspector"),
284+
readOnlyVolumeMount("weblogic-credentials-volume", "/weblogic-operator/secrets"),
285+
readOnlyVolumeMount("weblogic-domain-debug-cm-volume", "/weblogic-operator/debug"),
286+
readOnlyVolumeMount("weblogic-domain-cm-volume", "/weblogic-operator/scripts")));
287+
}
288+
276289
@Test
277290
public void whenPodCreated_lifecyclePreStopHasStopServerCommand() {
278291
assertThat(

0 commit comments

Comments
 (0)