Fix

Author: sankarpn

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

@@ -493,11 +493,25 @@ private void recreateConfigMapandRestart(String oldSecret, String newSecret) thr
     // stop all running wls pods
     int clusterReplicas =
         TestUtils.getClusterReplicas(DOMAINUID, domain.getClusterName(), domain.getDomainNs());
-    String patchStr = "'{\"spec\":{\"serverStartPolicy\":\"NEVER\"}}'";    
+    String patchStr = "'{\"spec\":{\"serverStartPolicy\":\"NEVER\"}}'";
     TestUtils.kubectlpatch(DOMAINUID, domain.getDomainNs(), patchStr);
     Thread.sleep(60000);
     domain.verifyServerPodsDeleted(clusterReplicas);
+    TestUtils.exec("kubectl get all --all-namespaces", true);
 
+    // recreate the configmap with new overrride files
+    String cmd =
+        "kubectl create configmap "
+            + DOMAINUID
+            + "-sitconfigcm --from-file="
+            + configOverrideDir
+            + " -o yaml --dry-run | kubectl replace -f -";
+    TestUtils.exec(cmd, true);
+
+    cmd = "kubectl describe cm -n " + domain.getDomainNs() + " customsitconfigdomain-sitconfigcm";
+    TestUtils.exec(cmd, true);
+
+    // now modify the domain.yaml if the secret name is changed
     if (!oldSecret.equals(newSecret)) {
       String content =
           new String(Files.readAllBytes(Paths.get(domainYaml)), StandardCharsets.UTF_8);
@@ -506,38 +520,25 @@ private void recreateConfigMapandRestart(String oldSecret, String newSecret) thr
           Paths.get(domainYaml),
           content.getBytes(StandardCharsets.UTF_8),
           StandardOpenOption.TRUNCATE_EXISTING);
+      logger.log(Level.INFO, content);
 
       // delete the old secret and add new secret to domain.yaml
       TestUtils.exec("kubectl delete secret " + domain.getDomainUid() + "-" + oldSecret, true);
-      String cmd =
+      cmd =
           "kubectl -n "
               + domain.getDomainNs()
               + " create secret generic "
               + domain.getDomainUid()
               + "-"
               + newSecret
               + " --from-literal=hostname="
-              + TestUtils.getHostName()
+              + fqdn
               + " --from-literal=dbusername=root"
               + " --from-literal=dbpassword=root123";
       TestUtils.exec(cmd, true);
+      // apply the new domain.yaml
+      TestUtils.exec("kubectl apply -f " + domainYaml, true);
     }
-
-    // recreate the configmap with new overrride files
-    String cmd =
-        "kubectl create configmap "
-            + DOMAINUID
-            + "-sitconfigcm --from-file="
-            + configOverrideDir
-            + " -o yaml --dry-run | kubectl replace -f -";
-    TestUtils.exec(cmd, true);
-
-    cmd = "kubectl describe cm -n " + domain.getDomainNs() + " customsitconfigdomain-sitconfigcm";
-    TestUtils.exec(cmd, true);
-
-    // apply the new domain.yaml
-    TestUtils.exec("kubectl apply -f " + domainYaml, true);
-
     // start the pods so that introspector can run and replace files with new secret if changed and
     // with new config override files
     patchStr = "'{\"spec\":{\"serverStartPolicy\":\"IF_NEEDED\"}}'";