Merge pull request #589 from oracle/introspector-dhii-nopv

OWLS-70492 Domain-in-image use case does not work

Author: rjeberhard

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/DomainSpec.java

@@ -482,6 +482,11 @@ public void setDomainHomeInImage(boolean domainHomeInImage) {
     this.domainHomeInImage = domainHomeInImage;
   }
 
+  public DomainSpec withDomainHomeInImage(boolean domainHomeInImage) {
+    setDomainHomeInImage(domainHomeInImage);
+    return this;
+  }
+
   /**
    * The desired number of running managed servers in each WebLogic cluster that is not explicitly
    * configured in clusters.

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

@@ -209,7 +209,6 @@ private V1PodSpec createPodSpec(TuningParameters tuningParameters) {
                 new V1Volume().name(SCRIPTS_VOLUME).configMap(getConfigMapVolumeSource()));
 
     podSpec.setImagePullSecrets(info.getDomain().getSpec().getImagePullSecrets());
-
     if (getClaimName() != null) {
       podSpec.addVolumesItem(
           new V1Volume()
@@ -242,10 +241,13 @@ private V1Container createContainer(TuningParameters tuningParameters) {
             .imagePullPolicy(getImagePullPolicy())
             .command(getContainerCommand())
             .env(getEnvironmentVariables(tuningParameters))
-            .addVolumeMountsItem(volumeMount(STORAGE_VOLUME, STORAGE_MOUNT_PATH))
             .addVolumeMountsItem(readOnlyVolumeMount(SECRETS_VOLUME, SECRETS_MOUNT_PATH))
             .addVolumeMountsItem(readOnlyVolumeMount(SCRIPTS_VOLUME, SCRIPTS_MOUNTS_PATH));
 
+    if (getClaimName() != null) {
+      container.addVolumeMountsItem(volumeMount(STORAGE_VOLUME, STORAGE_MOUNT_PATH));
+    }
+
     if (getConfigOverrides() != null && getConfigOverrides().length() > 0) {
       container.addVolumeMountsItem(
           readOnlyVolumeMount(getConfigOverrides() + "-volume", OVERRIDES_CM_MOUNT_PATH));
@@ -278,7 +280,7 @@ protected List<String> getContainerCommand() {
   abstract List<V1EnvVar> getEnvironmentVariables(TuningParameters tuningParameters);
 
   protected String getDomainHome() {
-    return "/shared/domains/" + getDomainUID();
+    return getDomain().getDomainHome();
   }
 
   static void addEnvVar(List<V1EnvVar> vars, String name, String value) {

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

@@ -659,12 +659,15 @@ private V1Container createContainer(TuningParameters tuningParameters) {
             .env(getEnvironmentVariables(tuningParameters))
             .addPortsItem(new V1ContainerPort().containerPort(getPort()).protocol("TCP"))
             .lifecycle(createLifecycle())
-            .addVolumeMountsItem(volumeMount(STORAGE_VOLUME, STORAGE_MOUNT_PATH))
             .addVolumeMountsItem(readOnlyVolumeMount(SECRETS_VOLUME, SECRETS_MOUNT_PATH))
             .addVolumeMountsItem(readOnlyVolumeMount(SCRIPTS_VOLUME, SCRIPTS_MOUNTS_PATH))
             .addVolumeMountsItem(readOnlyVolumeMount(DEBUG_CM_VOLUME, DEBUG_CM_MOUNTS_PATH))
             .livenessProbe(createLivenessProbe(tuningParameters.getPodTuning()));
 
+    if (getClaimName() != null) {
+      v1Container.addVolumeMountsItem(volumeMount(STORAGE_VOLUME, STORAGE_MOUNT_PATH));
+    }
+
     if (!mockWLS()) {
       v1Container.readinessProbe(createReadinessProbe(tuningParameters.getPodTuning()));
     }

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

@@ -170,7 +170,8 @@ private DomainSpec createDomainSpec() {
             .withAdminSecret(new V1SecretReference().name(ADMIN_SECRET_NAME))
             .withConfigOverrides(OVERRIDES_CM)
             .withCluster(cluster)
-            .withImage(LATEST_IMAGE);
+            .withImage(LATEST_IMAGE)
+            .withDomainHomeInImage(false);
 
     List<String> overrideSecrets = new ArrayList();
     overrideSecrets.add(OVERRIDE_SECRET_1);
@@ -227,6 +228,10 @@ public void whenJobCreated_specHasOneContainer() {
 
   @Test
   public void whenJobCreated_containerHasExpectedVolumeMounts() {
+    domainPresenceInfo
+        .getClaims()
+        .addItemsItem(
+            new V1PersistentVolumeClaim().metadata(new V1ObjectMeta().name("claim-name")));
     assertThat(
         getCreatedJobSpecContainer().getVolumeMounts(),
         containsInAnyOrder(
@@ -238,6 +243,19 @@ public void whenJobCreated_containerHasExpectedVolumeMounts() {
             readOnlyVolumeMount(OVERRIDE_SECRET_2 + "-volume", OVERRIDE_SECRETS_MOUNT_PATH)));
   }
 
+  @Test
+  public void whenJobCreated_withNoPVC_containerHasExpectedVolumeMounts() {
+    domainPresenceInfo.getClaims().getItems().clear();
+    assertThat(
+        getCreatedJobSpecContainer().getVolumeMounts(),
+        containsInAnyOrder(
+            readOnlyVolumeMount(SECRETS_VOLUME, SECRETS_MOUNT_PATH),
+            readOnlyVolumeMount(SCRIPTS_VOLUME, SCRIPTS_MOUNTS_PATH),
+            readOnlyVolumeMount(OVERRIDES_CM + "-volume", OVERRIDES_CM_MOUNT_PATH),
+            readOnlyVolumeMount(OVERRIDE_SECRET_1 + "-volume", OVERRIDE_SECRETS_MOUNT_PATH),
+            readOnlyVolumeMount(OVERRIDE_SECRET_2 + "-volume", OVERRIDE_SECRETS_MOUNT_PATH)));
+  }
+
   @SuppressWarnings("unchecked")
   @Test
   public void whenJobCreated_hasPredefinedEnvVariables() {

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

@@ -258,6 +258,10 @@ public void whenPodCreatedWithPullSecret_addToPod() {
 
   @Test
   public void whenPodCreated_containerHasExpectedVolumeMounts() {
+    domainPresenceInfo
+        .getClaims()
+        .addItemsItem(
+            new V1PersistentVolumeClaim().metadata(new V1ObjectMeta().name("claim-name")));
     assertThat(
         getCreatedPodSpecContainer().getVolumeMounts(),
         containsInAnyOrder(
@@ -269,6 +273,19 @@ public void whenPodCreated_containerHasExpectedVolumeMounts() {
             readOnlyVolumeMount("weblogic-domain-cm-volume", "/weblogic-operator/scripts")));
   }
 
+  @Test
+  public void whenPodCreated_withNoPVC_containerHasExpectedVolumeMounts() {
+    domainPresenceInfo.getClaims().getItems().clear();
+    assertThat(
+        getCreatedPodSpecContainer().getVolumeMounts(),
+        containsInAnyOrder(
+            writableVolumeMount(
+                UID + SIT_CONFIG_MAP_VOLUME_SUFFIX, "/weblogic-operator/introspector"),
+            readOnlyVolumeMount("weblogic-credentials-volume", "/weblogic-operator/secrets"),
+            readOnlyVolumeMount("weblogic-domain-debug-cm-volume", "/weblogic-operator/debug"),
+            readOnlyVolumeMount("weblogic-domain-cm-volume", "/weblogic-operator/scripts")));
+  }
+
   @Test
   public void whenPodCreated_lifecyclePreStopHasStopServerCommand() {
     assertThat(