fix issues with volumes and volume mounts for introspector job

Author: lennyphan

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

@@ -4,6 +4,7 @@
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 import oracle.kubernetes.operator.KubernetesConstants;
 import oracle.kubernetes.operator.LabelConstants;
 import oracle.kubernetes.operator.ProcessingConstants;
@@ -70,8 +71,13 @@ private List<V1PersistentVolumeClaim> getClaims() {
     return info.getClaims().getItems();
   }
 
+  private String getDiscoveredClaim() {
+    return getClaims().isEmpty() ? null : getClaims().iterator().next().getMetadata().getName();
+  }
+
   private String getClaimName() {
-    return getClaims().iterator().next().getMetadata().getName();
+    return Optional.ofNullable(info.getDomain().getPersistentVolumeClaimName())
+        .orElse(getDiscoveredClaim());
   }
 
   // ----------------------- step methods ------------------------------
@@ -208,7 +214,7 @@ private V1PodSpec createPodSpec(TuningParameters tuningParameters) {
 
     podSpec.setImagePullSecrets(info.getDomain().getSpec().getImagePullSecrets());
 
-    if (!getClaims().isEmpty()) {
+    if (getClaimName() != null) {
       podSpec.addVolumesItem(
           new V1Volume()
               .name(STORAGE_VOLUME)
@@ -222,10 +228,12 @@ private V1PodSpec createPodSpec(TuningParameters tuningParameters) {
               .name(secretName + "-volume")
               .secret(getOverrideSecretVolumeSource(secretName)));
     }
-    podSpec.addVolumesItem(
-        new V1Volume()
-            .name(getConfigOverrides() + "-volume")
-            .configMap(getOverridesVolumeSource(getConfigOverrides())));
+    if (getConfigOverrides() != null && getConfigOverrides().length() > 0) {
+      podSpec.addVolumesItem(
+          new V1Volume()
+              .name(getConfigOverrides() + "-volume")
+              .configMap(getOverridesVolumeSource(getConfigOverrides())));
+    }
 
     return podSpec;
   }
@@ -239,11 +247,14 @@ private V1Container createContainer(TuningParameters tuningParameters) {
             .command(getContainerCommand())
             .env(getEnvironmentVariables(tuningParameters))
             .addVolumeMountsItem(volumeMount(STORAGE_VOLUME, STORAGE_MOUNT_PATH))
-            .addVolumeMountsItem(
-                readOnlyVolumeMount(getConfigOverrides() + "-volume", OVERRIDES_CM_MOUNT_PATH))
             .addVolumeMountsItem(readOnlyVolumeMount(SECRETS_VOLUME, SECRETS_MOUNT_PATH))
             .addVolumeMountsItem(readOnlyVolumeMount(SCRIPTS_VOLUME, SCRIPTS_MOUNTS_PATH));
 
+    if (getConfigOverrides() != null && getConfigOverrides().length() > 0) {
+      container.addVolumeMountsItem(
+          readOnlyVolumeMount(getConfigOverrides() + "-volume", OVERRIDES_CM_MOUNT_PATH));
+    }
+
     List<String> configOverrideSecrets = getConfigOverrideSecrets();
     for (String secretName : configOverrideSecrets) {
       container.addVolumeMountsItem(

operator/src/main/resources/scripts/introspectDomain.py

@@ -617,6 +617,7 @@ def addSitCfgXml(self):
     self.writeln("<?xml version='1.0' encoding='UTF-8'?>")
     self.writeln("<d:domain xmlns:d=\"http://xmlns.oracle.com/weblogic/domain\" xmlns:f=\"http://xmlns.oracle.com/weblogic/domain-fragment\" xmlns:s=\"http://xmlns.oracle.com/weblogic/situational-config\">")
     self.indent()
+    self.writeln("<s:expiration> 2020-07-16T19:20+01:00 </s:expiration>")
     self.customizeNodeManagerCreds()
     self.customizeDomainLogPath()
     self.customizeServers()