fix CreateDomainGeneratedFilesOptionalFeaturesDisabledIT and update names of pre-install pv and pvc names

Author: alai8

kubernetes/charts/weblogic-domain/templates/create-weblogic-domain-job.yaml

@@ -306,7 +306,7 @@ spec:
             name: {{ .Values.domainUID }}-create-weblogic-domain-job-cm
         - name: weblogic-domain-storage-volume
           persistentVolumeClaim:
-            claimName: {{ .Values.domainUID }}-weblogic-domain-pvc
+            claimName: {{ .Values.domainUID }}-weblogic-domain-job-pvc
         - name: weblogic-credentials-volume
           secret:
             secretName: {{ .Values.weblogicCredentialsSecretName }}

kubernetes/charts/weblogic-domain/templates/create-weblogic-domain-pv.yaml

@@ -4,7 +4,7 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{ .Values.domainUID }}-weblogic-domain-pv
+  name: {{ .Values.domainUID }}-weblogic-domain-job-pv
   labels:
     weblogic.resourceVersion: domain-v1
     weblogic.domainUID: {{ .Values.domainUID }}

kubernetes/charts/weblogic-domain/templates/create-weblogic-domain-pvc.yaml

@@ -4,7 +4,7 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ .Values.domainUID }}-weblogic-domain-pvc
+  name: {{ .Values.domainUID }}-weblogic-domain-job-pvc
   namespace: {{ .Release.Namespace }}
   labels:
     weblogic.resourceVersion: domain-v1

kubernetes/src/test/java/oracle/kubernetes/operator/helm/CreateDomainGeneratedFilesOptionalFeaturesDisabledIT.java

@@ -4,16 +4,98 @@
 
 package oracle.kubernetes.operator.helm;
 
+import static oracle.kubernetes.operator.utils.YamlUtils.yamlEqualTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import io.kubernetes.client.models.V1ConfigMap;
+import io.kubernetes.client.models.V1Job;
+import io.kubernetes.client.models.V1PersistentVolume;
+import io.kubernetes.client.models.V1PersistentVolumeClaim;
 import oracle.kubernetes.operator.create.CreateDomainGeneratedFilesOptionalFeaturesDisabledTestBase;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
+import org.junit.Test;
 
-@Ignore
 public class CreateDomainGeneratedFilesOptionalFeaturesDisabledIT
     extends CreateDomainGeneratedFilesOptionalFeaturesDisabledTestBase {
 
   @BeforeClass
   public static void setup() throws Exception {
     defineDomainYamlFactory(new HelmDomainYamlFactory());
   }
+
+  @Override
+  protected V1Job getExpectedCreateWeblogicDomainJob() {
+    V1Job expected = super.getExpectedCreateWeblogicDomainJob();
+    expected
+        .getMetadata()
+        .putAnnotationsItem("helm.sh/hook", "pre-install")
+        .putAnnotationsItem("helm.sh/hook-delete-policy", "hook-succeeded")
+        .putAnnotationsItem("helm.sh/hook-weight", "0");
+    expected
+        .getSpec()
+        .getTemplate()
+        .getSpec()
+        .getVolumes()
+        .get(1)
+        .getPersistentVolumeClaim()
+        .claimName(getInputs().getWeblogicDomainJobPersistentVolumeClaimName());
+    return expected;
+  }
+
+  @Override
+  protected V1ConfigMap getExpectedCreateWeblogicDomainJobConfigMap() {
+    V1ConfigMap expected = super.getExpectedCreateWeblogicDomainJobConfigMap();
+    expected
+        .getMetadata()
+        .putAnnotationsItem("helm.sh/hook", "pre-install")
+        .putAnnotationsItem("helm.sh/hook-delete-policy", "hook-succeeded")
+        .putAnnotationsItem("helm.sh/hook-weight", "-5");
+    return expected;
+  }
+
+  @Test
+  public void generatesCorrect_weblogicDomainJobPersistentVolume() throws Exception {
+    assertThat(
+        getActualWeblogicDomainJobPersistentVolume(),
+        yamlEqualTo(getExpectedWeblogicDomainJobPersistentVolume()));
+  }
+
+  protected V1PersistentVolume getActualWeblogicDomainJobPersistentVolume() {
+    return getWeblogicDomainPersistentVolumeYaml().getWeblogicDomainJobPersistentVolume();
+  }
+
+  protected V1PersistentVolume getExpectedWeblogicDomainJobPersistentVolume() {
+    V1PersistentVolume expected = getExpectedWeblogicDomainPersistentVolume();
+    expected.getMetadata().setName(getInputs().getWeblogicDomainJobPersistentVolumeName());
+    expected
+        .getMetadata()
+        .putAnnotationsItem("helm.sh/hook", "pre-install")
+        .putAnnotationsItem("helm.sh/hook-delete-policy", "hook-succeeded,hook-failed")
+        .putAnnotationsItem("helm.sh/hook-weight", "-5");
+    ;
+    return expected;
+  }
+
+  @Test
+  public void generatesCorrect_weblogicDomainJobPersistentVolumeClaim() throws Exception {
+    assertThat(
+        getActualWeblogicDomainJobPersistentVolumeClaim(),
+        yamlEqualTo(getExpectedWeblogicDomainJobPersistentVolumeClaim()));
+  }
+
+  protected V1PersistentVolumeClaim getActualWeblogicDomainJobPersistentVolumeClaim() {
+    return getWeblogicDomainPersistentVolumeClaimYaml().getWeblogicDomainJobPersistentVolumeClaim();
+  }
+
+  protected V1PersistentVolumeClaim getExpectedWeblogicDomainJobPersistentVolumeClaim() {
+    V1PersistentVolumeClaim expected = getExpectedWeblogicDomainPersistentVolumeClaim();
+    expected.getMetadata().setName(getInputs().getWeblogicDomainJobPersistentVolumeClaimName());
+    expected
+        .getMetadata()
+        .putAnnotationsItem("helm.sh/hook", "pre-install")
+        .putAnnotationsItem("helm.sh/hook-delete-policy", "hook-succeeded,hook-failed")
+        .putAnnotationsItem("helm.sh/hook-weight", "-5");
+    ;
+    return expected;
+  }
 }

kubernetes/src/test/java/oracle/kubernetes/operator/helm/HelmDomainYamlFactory.java

@@ -41,7 +41,7 @@ static class YamlGenerator extends oracle.kubernetes.operator.utils.YamlGenerato
 
     YamlGenerator(DomainValues inputValues) throws Exception {
       Map<String, Object> overrides = ((HelmDomainValues) inputValues).createMap();
-      chart = new ProcessedChart("weblogic-domain", overrides);
+      chart = new ProcessedChart("weblogic-domain", overrides, (String) overrides.get("namespace"));
 
       assertThat(chart.getError(), emptyOrNullString());
 

kubernetes/src/test/java/oracle/kubernetes/operator/helm/ProcessedChart.java

@@ -34,10 +34,16 @@ public class ProcessedChart implements YamlReader {
   private List<Object> documents;
   private Process process;
   private Map<String, Object> values;
+  private String namespace;
 
   ProcessedChart(String chartName, Map<String, Object> valueOverrides) {
+    this(chartName, valueOverrides, null);
+  }
+
+  ProcessedChart(String chartName, Map<String, Object> valueOverrides, String namespace) {
     this.chartName = chartName;
     this.valueOverrides = valueOverrides;
+    this.namespace = namespace;
   }
 
   boolean matches(String chartName, Map<String, Object> valueOverrides) {
@@ -149,7 +155,21 @@ private void applyOverrides(Map<String, Object> valueOverrides) {
   }
 
   private String[] createCommandLine(File chart, Path valuesPath) {
-    return new String[] {"helm", "template", chart.getAbsolutePath(), "-f", valuesPath.toString()};
+    if (namespace == null) {
+      return new String[] {
+        "helm", "template", chart.getAbsolutePath(), "-f", valuesPath.toString()
+      };
+    } else {
+      return new String[] {
+        "helm",
+        "template",
+        chart.getAbsolutePath(),
+        "-f",
+        valuesPath.toString(),
+        "--namespace",
+        namespace
+      };
+    }
   }
 
   private Path writeValuesOverride(Map<String, Object> values) throws IOException {

kubernetes/src/test/java/oracle/kubernetes/operator/utils/DomainValues.java

@@ -128,6 +128,14 @@ public String getWeblogicDomainPersistentVolumeClaimName() {
     return getDomainUID() + "-weblogic-domain-pvc";
   }
 
+  public String getWeblogicDomainJobPersistentVolumeName() {
+    return getDomainUID() + "-weblogic-domain-job-pv";
+  }
+
+  public String getWeblogicDomainJobPersistentVolumeClaimName() {
+    return getDomainUID() + "-weblogic-domain-job-pvc";
+  }
+
   public String getAdminServerName() {
     return adminServerName;
   }

kubernetes/src/test/java/oracle/kubernetes/operator/utils/ParsedWeblogicDomainPersistentVolumeClaimYaml.java

@@ -28,6 +28,10 @@ public V1PersistentVolumeClaim getWeblogicDomainPersistentVolumeClaim() {
     return getPersistentVolumeClaims().find(inputs.getWeblogicDomainPersistentVolumeClaimName());
   }
 
+  public V1PersistentVolumeClaim getWeblogicDomainJobPersistentVolumeClaim() {
+    return getPersistentVolumeClaims().find(inputs.getWeblogicDomainJobPersistentVolumeClaimName());
+  }
+
   public int getExpectedObjectCount() {
     return 1;
   }

kubernetes/src/test/java/oracle/kubernetes/operator/utils/ParsedWeblogicDomainPersistentVolumeYaml.java

@@ -28,6 +28,10 @@ public V1PersistentVolume getWeblogicDomainPersistentVolume() {
     return getPersistentVolumes().find(inputs.getWeblogicDomainPersistentVolumeName());
   }
 
+  public V1PersistentVolume getWeblogicDomainJobPersistentVolume() {
+    return getPersistentVolumes().find(inputs.getWeblogicDomainJobPersistentVolumeName());
+  }
+
   public int getExpectedObjectCount() {
     return 1;
   }