use retry for getting token and verifying the http response from admin server (#3533)

* use retry for getting token and verifying the http response from
adminserver

* fix waitForPod in ingress installation

* fix ingress deletion

Author: sankarpn

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

@@ -822,9 +822,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, "Waiting for http response code 200 and message Connection successful");
     }
   }
 

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

@@ -92,7 +92,15 @@ public static String getSecretOfServiceAccount(String namespace, String serviceA
     return saSecretName;
   }
 
-  private static boolean hasToken(String saSecretName, String namespace) throws ApiException {
+  /**
+   * Check if the secret has token.
+   *
+   * @param saSecretName name of the secret
+   * @param namespace namespace in which secret exists
+   * @return true if token in the secret exists otherwise false
+   * @throws ApiException when there is issue getting secret
+   */
+  public static boolean hasToken(String saSecretName, String namespace) throws ApiException {
     V1Secret secret = Kubernetes.getSecret(saSecretName, namespace);
     if (secret != null) {
       Map<String, byte[]> data = Optional.of(secret).map(V1Secret::getData).orElse(Collections.emptyMap());
@@ -109,6 +117,10 @@ private static boolean hasToken(String saSecretName, String namespace) throws Ap
    * @return the encoded token of the secret
    */
   public static String getSecretEncodedToken(String namespace, String secretName) {
+    testUntil(
+        () -> hasToken(secretName, namespace),
+        getLogger(),
+        "Waiting for token to be populated in secret");
 
     List<V1Secret> v1Secrets = new ArrayList<>();
 

kubernetes/samples/charts/util/setupLoadBalancer.sh

@@ -168,18 +168,23 @@ createNameSpace() {
 waitForIngressPod() {
   type=$1
   ns=$2
+  if [[ "${type}" == "traefik" ]]; then
+    instance=${type}-release-${ns}
+  elif [[ "${type}" == "nginx" ]]; then
+    instance=${type}-release
+  fi
 
   printInfo "Wait (max 5min) until ${type} ingress controller pod to be ready."
   ${kubernetesCli} wait --namespace ${ns} \
   --for=condition=ready pod \
-  --selector=app.kubernetes.io/instance=${type}-release \
+  --selector=app.kubernetes.io/instance=${instance} \
   --timeout=300s
 
   if [ $? != 0 ]; then
    printError "${type} ingress controller pod not READY in state in 5 min"
    exit -1;
   else 
-   ipod=$(${kubernetesCli} get pod -n ${ns} -l app.kubernetes.io/instance=${type}-release -o jsonpath="{.items[0].metadata.name}")
+   ipod=$(${kubernetesCli} get pod -n ${ns} -l app.kubernetes.io/instance=${instance} -o jsonpath="{.items[0].metadata.name}")
    ${kubernetesCli} get po/${ipod} -n ${ns}
    helm list -n ${ns}
   fi 
@@ -247,12 +252,19 @@ purgeDefaultResources() {
 deleteIngress() {
   type=${1}
   ns=${2}
+
+  if [[ "${type}" == "traefik" ]]; then
+    instance=${type}-release-${ns}
+  elif [[ "${type}" == "nginx" ]]; then
+    instance=${type}-release
+  fi
+  
   if [ "$(helm list --namespace $ns | grep $chart |  wc -l)" = 1 ]; then
     printInfo "Deleting ${type} controller from namespace $ns" 
     helm uninstall --namespace $ns $chart
     ${kubernetesCli} wait --namespace ${ns} \
        --for=delete pod \
-       --selector=app.kubernetes.io/instance=${type}-release \
+       --selector=app.kubernetes.io/instance=${instance} \
        --timeout=120s
     if [ ${skipDeleteNamespace} == "false" ]; then
       ${kubernetesCli} delete ns ${ns}