Port prs 3533, 3579 to main (#3664)

* port prs 3533,3579 to main

Author: sankarpn

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

@@ -825,9 +825,11 @@ private void verifyResourceJDBC1Override(boolean configUpdated) {
     for (int i = 1; i <= replicaCount; i++) {
       appURI = "dsTest=true&dsName=" + dsName1 + "&" + "serverName=" + managedServerNameBase + i;
       String dsConnectionPoolTestUrl = baseUri + appURI;
-      HttpResponse<String> response = assertDoesNotThrow(() -> OracleHttpClient.get(dsConnectionPoolTestUrl, true));
-      assertEquals(200, response.statusCode(), "Status code not equals to 200");
-      assertTrue(response.body().contains("Connection successful"), "Didn't get Connection successful");
+      testUntil(() -> {
+        HttpResponse<String> response = assertDoesNotThrow(() -> OracleHttpClient.get(dsConnectionPoolTestUrl, true));
+        logger.info("Http response status code {0} \n Http response body {1} ", response.statusCode(), response.body());
+        return response.statusCode() == 200 && response.body().contains("Connection successful");
+      }, logger, "http response code 200 and message Connection successful");
     }
   }
 

integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Domain.java

@@ -33,6 +33,7 @@
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_SERVER_NAME_BASE;
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
+import static oracle.weblogic.kubernetes.TestConstants.OKD;
 import static oracle.weblogic.kubernetes.TestConstants.PROJECT_ROOT;
 import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.RBAC_API_GROUP;
@@ -57,6 +58,7 @@
 import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class Domain {
@@ -457,9 +459,11 @@ public static boolean scaleClusterWithRestApi(String domainUid,
         secretName, opServiceAccount, opNamespace, secretToken);
 
     // decode the secret encoded token
-    String decodedToken = new String(Base64.getDecoder().decode(secretToken));
+    String decodedToken = OKD ? secretToken : new String(Base64.getDecoder().decode(secretToken));
     logger.info("Got decoded token for secret {0} associated with service account {1} in namespace {2}: {3}",
         secretName, opServiceAccount, opNamespace, decodedToken);
+    
+    assertNotNull(decodedToken, "Couldn't get secret, token is null");
 
     // build the curl command to scale the cluster
     String command = new StringBuffer()

integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Secret.java

@@ -17,6 +17,7 @@
 import oracle.weblogic.kubernetes.actions.impl.primitive.Kubernetes;
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
 
+import static oracle.weblogic.kubernetes.TestConstants.OKD;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
 import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
 
@@ -120,9 +121,18 @@ public static String getSecretEncodedToken(String namespace, String secretName)
     for (V1Secret v1Secret : v1Secrets) {
       if (v1Secret.getMetadata() != null && v1Secret.getMetadata().getName() != null) {
         if (v1Secret.getMetadata().getName().equals(secretName)) {
-          if (v1Secret.getData() != null) {
-            byte[] encodedToken = v1Secret.getData().get("token");
-            return Base64.getEncoder().encodeToString(encodedToken);
+          if (OKD) {
+            for (Map.Entry<String, String> annotation : v1Secret.getMetadata().getAnnotations().entrySet()) {
+              if (annotation.getKey().equals("openshift.io/token-secret.value")) {
+                return annotation.getValue();
+              }
+            }
+            return null;
+          } else {
+            if (v1Secret.getData() != null) {
+              byte[] encodedToken = v1Secret.getData().get("token");
+              return Base64.getEncoder().encodeToString(encodedToken);
+            }
           }
         }
       }