Merge branch 'xc-111154-41' into 'release/4.1'

backport the fix for ItUsabilityOperatorHelmChart to release/4.1

See merge request weblogic-cloud/weblogic-kubernetes-operator!4371

Author: rjeberhard

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItUsabilityOperatorHelmChart.java

@@ -267,7 +267,7 @@ void testDeleteOperatorButNotDomain() {
 
       // delete operator
       logger.info("Uninstalling operator");
-      uninstallOperator(opHelmParams);
+      uninstallOperatorAndVerify(opHelmParams);
       cleanUpSA(opNamespace);
       deleteSecret(TEST_IMAGES_REPO_SECRET_NAME, opNamespace);
 
@@ -349,7 +349,7 @@ void testCreateDeleteCreateOperatorButNotDomain() {
       }
       // delete operator
       logger.info("Uninstalling operator");
-      uninstallOperator(opHelmParams);
+      uninstallOperatorAndVerify(opHelmParams);
 
       //install second time
       opHelmParams = installOperatorHelmChart(opNamespace, opServiceAccount, false, true, false,
@@ -375,7 +375,7 @@ void testCreateDeleteCreateOperatorButNotDomain() {
       logger.info("Domain1 scaled to " + replicaCountDomain1 + " servers");
 
     } finally {
-      uninstallOperator(op1HelmParams);
+      uninstallOperatorAndVerify(op1HelmParams);
       deleteSecret(TEST_IMAGES_REPO_SECRET_NAME, opNamespace);
       cleanUpSA(opNamespace);
       if (!isDomain1Running) {
@@ -490,7 +490,7 @@ void testAddRemoveDomainNameSpacesOnOperator() {
           "operator can still manage domain3, scaling was succeeded for " + managedServerPodName1);
 
     } finally {
-      uninstallOperator(op1HelmParams);
+      uninstallOperatorAndVerify(op1HelmParams);
       deleteSecret(TEST_IMAGES_REPO_SECRET_NAME, op2Namespace);
       cleanUpSA(op2Namespace);
       if (!isDomain2Running) {
@@ -534,8 +534,8 @@ void testCreateSecondOperatorUsingSameOperatorNsNegativeInstall() {
       assertNull(opHelmParam2,
           "FAILURE: Helm installs operator in the same namespace as first operator installed ");
     } finally {
-      uninstallOperator(opHelmParams);
-      uninstallOperator(op2HelmParams);
+      uninstallOperatorAndVerify(opHelmParams);
+      uninstallOperatorAndVerify(op2HelmParams);
       deleteSecret(TEST_IMAGES_REPO_SECRET_NAME, opNamespace);
       cleanUpSA(opNamespace);
       if (!isDomain1Running) {
@@ -579,8 +579,8 @@ void testSecondOpSharingSameDomainNamespacesNegativeInstall() {
           expectedError,"failed", 0, op2HelmParams,  LIST_STRATEGY, domain2Namespace);
       assertNull(opHelmParam2, "FAILURE: Helm installs operator in the same namespace as first operator installed ");
     } finally {
-      uninstallOperator(opHelmParams);
-      uninstallOperator(op2HelmParams);
+      uninstallOperatorAndVerify(opHelmParams);
+      uninstallOperatorAndVerify(op2HelmParams);
       deleteSecret(TEST_IMAGES_REPO_SECRET_NAME, opNamespace);
       cleanUpSA(opNamespace);
       cleanUpSA(op2Namespace);
@@ -627,9 +627,9 @@ void testSecondOpSharingSameExternalRestPortNegativeInstall() {
           expectedError,"failed",
           externalRestHttpsPort, op2HelmParams, LIST_STRATEGY, domain2Namespace);
       assertNull(opHelmParam2, "FAILURE: Helm installs operator in the same namespace as first operator installed ");
-      uninstallOperator(op2HelmParams);
+      uninstallOperatorAndVerify(op2HelmParams);
     } finally {
-      uninstallOperator(opHelmParams);
+      uninstallOperatorAndVerify(opHelmParams);
       deleteSecret(TEST_IMAGES_REPO_SECRET_NAME, opNamespace);
       deleteSecret(TEST_IMAGES_REPO_SECRET_NAME, op2Namespace);
       cleanUpSA(opNamespace);
@@ -660,7 +660,7 @@ void testNotPreCreatedOpNsCreateOperatorNegativeInstall() {
           LIST_STRATEGY, domain2Namespace);
       assertNull(opHelmParam2, "FAILURE: Helm installs operator in the same namespace as first operator installed ");
     } finally {
-      uninstallOperator(op2HelmParams);
+      uninstallOperatorAndVerify(op2HelmParams);
     }
   }
 
@@ -727,7 +727,7 @@ void testCreateWithEmptyDomainNamespaceInstall() {
       --replicaCountDomain2;
       logger.info("Domain2 scaled to " + replicaCountDomain2 + " servers");
     } finally {
-      uninstallOperator(op2HelmParams);
+      uninstallOperatorAndVerify(op2HelmParams);
       deleteSecret(TEST_IMAGES_REPO_SECRET_NAME, op2Namespace);
       cleanUpSA(op2Namespace);
       if (!isDomain2Running) {
@@ -802,7 +802,7 @@ void testNotPreexistedOpServiceAccountCreateOperatorNegativeInstall() {
       assertNotNull(errorMsg, "Expected error message for missing ServiceAccount not found");
     } finally {
       //uninstall operator helm chart
-      uninstallOperator(opHelmParams);
+      uninstallOperatorAndVerify(opHelmParams);
       deleteSecret(TEST_IMAGES_REPO_SECRET_NAME, op2Namespace);
       cleanUpSA(op2Namespace);
     }
@@ -904,7 +904,7 @@ void testTwoDomainsInSameNameSpaceOnOperator() {
       } catch (Exception ex) {
         logger.info("Failed to collect operator log");
       }
-      uninstallOperator(op1HelmParams);
+      uninstallOperatorAndVerify(op1HelmParams);
       deleteSecret(TEST_IMAGES_REPO_SECRET_NAME, op3Namespace);
       cleanUpSA(op3Namespace);
     }
@@ -1295,4 +1295,17 @@ private void cleanUpDomainSecrets(String domainNamespace) {
       }
     }
   }
+
+  private void uninstallOperatorAndVerify(HelmParams opHelmParams) {
+
+    logger.info("Uninstalling operator");
+    uninstallOperator(opHelmParams);
+
+    String opNamespace = opHelmParams.getNamespace();
+    // check the operator pod deleted
+    String operatorPodName = assertDoesNotThrow(() -> getOperatorPodName(OPERATOR_RELEASE_NAME, opNamespace),
+        "Can't get operator's pod name");
+    checkPodDoesNotExist(operatorPodName, null, opNamespace);
+
+  }
 }