Updated to use two different operators for the two testcases.

Author: chunshi-ora

integration-tests/src/test/java/oracle/kubernetes/operator/ITOperator.java

@@ -29,7 +29,8 @@ public class ITOperator extends BaseTest {
   // property file used to customize operator properties for operator inputs yaml
   private static String op1YamlFile = "operator1.yaml";
   private static String op2YamlFile = "operator2.yaml";
-  private static final String opForDelYamlFile = "operator_del.yaml";
+  private static final String opForDelYamlFile1 = "operator_del1.yaml";
+  private static final String opForDelYamlFile2 = "operator_del2.yaml";
 
   // property file used to customize domain properties for domain inputs yaml
   private static String domain1YamlFile = "domain1.yaml";
@@ -50,7 +51,8 @@ public class ITOperator extends BaseTest {
   private static Operator operator1, operator2;
   private static Domain domain1;
 
-  private static Operator operatorForDel;
+  private static Operator operatorForDel1;
+  private static Operator operatorForDel2;
 
   private K8sTestUtils k8sTestUtils = new K8sTestUtils();
 
@@ -298,9 +300,9 @@ public void testBCreateDomainWithDefaultValuesInSampleInputs() throws Exception
   public void testDeleteOneDomain() throws Exception {
     logTestBegin("Deleting one domain.");
 
-    if (operatorForDel == null) {
+    if (operatorForDel1 == null) {
       logger.info("About to create operator");
-      operatorForDel = TestUtils.createOperator(opForDelYamlFile);
+      operatorForDel1 = TestUtils.createOperator(opForDelYamlFile1);
     }
     final Domain domain = TestUtils.createDomain(domain1ForDelValueYamlFile);
     verifyBeforeDeletion(domain);
@@ -315,9 +317,9 @@ public void testDeleteOneDomain() throws Exception {
   public void testDeleteTwoDomains() throws Exception {
     logTestBegin("Deleting two domains.");
 
-    if (operatorForDel == null) {
+    if (operatorForDel2 == null) {
       logger.info("About to create operator");
-      operatorForDel = TestUtils.createOperator(opForDelYamlFile);
+      operatorForDel2 = TestUtils.createOperator(opForDelYamlFile2);
     }
     final Domain domainDel1 = TestUtils.createDomain(domain2ForDelValueYamlFile);
     final Domain domainDel2 = TestUtils.createDomain(domain3ForDelValueYamlFile);

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java

@@ -585,12 +585,27 @@ private void createPV() throws Exception {
   }
 
   private void createSecret() throws Exception {
-    new Secret(
-        domainNS,
-        domainMap.getOrDefault("secretName", domainUid + "-weblogic-credentials").toString(),
-        BaseTest.getUsername(),
-        BaseTest.getPassword());
-    domainMap.put("weblogicCredentialsSecretName", domainUid + "-weblogic-credentials");
+    Secret secret =
+        new Secret(
+            domainNS,
+            domainMap.getOrDefault("secretName", domainUid + "-weblogic-credentials").toString(),
+            BaseTest.getUsername(),
+            BaseTest.getPassword());
+    domainMap.put("weblogicCredentialsSecretName", secret.getSecretName());
+    final String labelCmd =
+        String.format(
+            "kubectl label secret %s weblogic.domainUID=%s -n %s",
+            secret.getSecretName(), domainUid, domainNS);
+    ExecResult result = ExecCommand.exec(labelCmd);
+    if (result.exitValue() != 0) {
+      throw new RuntimeException(
+          "FAILURE: command to label secret \""
+              + labelCmd
+              + "\" failed, returned "
+              + result.stdout()
+              + "\n"
+              + result.stderr());
+    }
   }
 
   private void generateInputYaml() throws Exception {

integration-tests/src/test/java/oracle/kubernetes/operator/utils/K8sTestUtils.java

@@ -16,10 +16,12 @@
 import io.kubernetes.client.models.V1ClusterRoleBindingList;
 import io.kubernetes.client.models.V1ClusterRoleList;
 import io.kubernetes.client.models.V1ConfigMapList;
+import io.kubernetes.client.models.V1DeploymentList;
 import io.kubernetes.client.models.V1JobList;
 import io.kubernetes.client.models.V1PersistentVolumeClaimList;
 import io.kubernetes.client.models.V1PersistentVolumeList;
 import io.kubernetes.client.models.V1PodList;
+import io.kubernetes.client.models.V1ReplicaSetList;
 import io.kubernetes.client.models.V1RoleBindingList;
 import io.kubernetes.client.models.V1RoleList;
 import io.kubernetes.client.models.V1SecretList;
@@ -114,47 +116,33 @@ public void verifyJobs(String labelSelectors, int expected) throws Exception {
   }
 
   public void verifyNoDeployments(String labelSelectors) throws Exception {
-    try {
-      appsV1Api.listDeploymentForAllNamespaces(
-          null,
-          null,
-          Boolean.TRUE,
-          labelSelectors,
-          null,
-          Boolean.FALSE.toString(),
-          null,
-          null,
-          Boolean.FALSE);
-      assertTrue("No deployments", false);
-    } catch (ApiException aex) {
-      if (aex.getCode() == 404) {
-        assertTrue("No deployements: ", true);
-      } else {
-        throw aex;
-      }
-    }
+    V1DeploymentList v1DeploymentList =
+        appsV1Api.listDeploymentForAllNamespaces(
+            null,
+            null,
+            Boolean.TRUE,
+            labelSelectors,
+            null,
+            Boolean.FALSE.toString(),
+            null,
+            null,
+            Boolean.FALSE);
+    assertEquals("No deployments", v1DeploymentList.getItems().size(), 0);
   }
 
   public void verifyNoReplicaSets(String labelSelectors) throws Exception {
-    try {
-      appsV1Api.listReplicaSetForAllNamespaces(
-          null,
-          null,
-          Boolean.TRUE,
-          labelSelectors,
-          null,
-          Boolean.FALSE.toString(),
-          null,
-          null,
-          Boolean.FALSE);
-      assertTrue("No ReplicaSets", false);
-    } catch (ApiException aex) {
-      if (aex.getCode() == 404) {
-        assertTrue("No ReplicaSets: ", true);
-      } else {
-        throw aex;
-      }
-    }
+    V1ReplicaSetList v1ReplicaSetList =
+        appsV1Api.listReplicaSetForAllNamespaces(
+            null,
+            null,
+            Boolean.TRUE,
+            labelSelectors,
+            null,
+            Boolean.FALSE.toString(),
+            null,
+            null,
+            Boolean.FALSE);
+    assertEquals("No ReplicaSets", v1ReplicaSetList.getItems().size(), 0);
   }
 
   public void verifyServices(String labelSelectors, int expected) throws Exception {

integration-tests/src/test/resources/domain_del_3.yaml

@@ -0,0 +1,9 @@
+# Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+
+domainUID: domainuid4del3
+exposeAdminT3Channel: true
+t3ChannelPort: 30111
+exposeAdminNodePort: true
+adminNodePort: 30719
+namespace: domain-ns-4-del-3

integration-tests/src/test/resources/operator_del.yaml renamed to integration-tests/src/test/resources/operator_del1.yaml

@@ -2,10 +2,10 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 #any property can be provided here from kubernetes/charts/weblogic-operator/values.yaml
-releaseName: op-4-del
+releaseName: op-4-del-1
 serviceAccount: weblogic-operator
-namespace: weblogic-operator-4-del
-domainNamespaces: [ "domain-ns-4-del-1", "domain-ns-4-del-2" ]
+namespace: weblogic-operator-4-del-1
+domainNamespaces: [ "domain-ns-4-del-1" ]
 externalRestEnabled: true
 externalRestHttpsPort: 32002
 javaLoggingLevel: FINE

integration-tests/src/test/resources/operator_del2.yaml

@@ -0,0 +1,11 @@
+# Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+
+#any property can be provided here from kubernetes/charts/weblogic-operator/values.yaml
+releaseName: op-4-del-2
+serviceAccount: weblogic-operator
+namespace: weblogic-operator-4-del-2
+domainNamespaces: [ "domain-ns-4-del-2", "domain-ns-4-del-3" ]
+externalRestEnabled: true
+externalRestHttpsPort: 32003
+javaLoggingLevel: FINE

kubernetes/delete-weblogic-domain-resources.sh

@@ -78,7 +78,6 @@ EOF
 #
 function getDomainResources {
   local domain_regex=''
-  local secret_regex=''
   if [ "$1" = "all" ]; then
     LABEL_SELECTOR="weblogic.domainUID"
   else
@@ -87,10 +86,8 @@ function getDomainResources {
     for i in "${!UIDS[@]}"; do
       if [ $i -gt 0 ]; then
         domain_regex="$domain_regex|"
-        secret_regex="$secret_regex|"
       fi
-      domain_regex="$domain_regex^Domain ${UIDS[$i]}"
-      secret_regex="$secret_regex^Secret ${UIDS[$i]}"
+      domain_regex="$domain_regex^Domain ${UIDS[$i]} "
     done
   fi
 
@@ -100,7 +97,7 @@ function getDomainResources {
   fi
 
   # first, let's get all namespaced types with -l $LABEL_SELECTOR
-  NAMESPACED_TYPES="pod,job,deploy,rs,service,pvc,ingress,cm,serviceaccount,role,rolebinding"
+  NAMESPACED_TYPES="pod,job,deploy,rs,service,pvc,ingress,cm,serviceaccount,role,rolebinding,secret"
 
   kubectl get $NAMESPACED_TYPES \
           -l "$LABEL_SELECTOR" \
@@ -115,14 +112,9 @@ function getDomainResources {
             --all-namespaces=true | egrep "$domain_regex" >> $2
   fi
 
-  # all secrets
-  kubectl get secret \
-          -o=jsonpath='{range .items[*]}{.kind}{" "}{.metadata.name}{" -n "}{.metadata.namespace}{"\n"}{end}' \
-          --all-namespaces=true | egrep "$secret_regex" >> $2
-
   # now, get all non-namespaced types with -l $LABEL_SELECTOR
 
-  NOT_NAMESPACED_TYPES="pv,crd,clusterroles,clusterrolebindings"
+  NOT_NAMESPACED_TYPES="pv,clusterroles,clusterrolebindings"
 
   kubectl get $NOT_NAMESPACED_TYPES \
           -l "$LABEL_SELECTOR" \
@@ -247,8 +239,8 @@ function deleteDomains {
       fi
     fi
 
-    # Delete domains and secretes, if any
-    cat $tempfile | egrep "^Secret |^Domain " | while read line; do
+    # Delete domains, if any
+    cat $tempfile | grep "^Domain " | while read line; do
       if [ "$test_mode" = "true" ]; then
         echo kubectl delete $line
       else