Merge branch 'okeconv42' into 'release/4.2'

update Create OKE script to add retry in case of connection to Kubernetes server error

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

Author: robertpatrick

Jenkinsfile.oke

@@ -425,7 +425,7 @@ EOF
                             mkdir -p ${WORKSPACE}/terraform/terraforminstall
                             sh ${WORKSPACE}/terraform/oke.create.sh ${OCI_PROP_FILE} ${WORKSPACE}/terraform
 
-                            clusterIP=$(oci ce cluster list --compartment-id=${compartment_id} | jq '.data[]  | select(."name" == '\"${CLUSTER_NAME}\"' and (."lifecycle-state" == "ACTIVE"))' | jq ' ."endpoints" | ."public-endpoint"')
+                            clusterIP=$(oci ce cluster list --compartment-id=${compartment_id} | jq '.data[]  | select(."name" == "'"${CLUSTER_NAME}"'" and (."lifecycle-state" == "ACTIVE"))' | jq ' ."endpoints" | ."public-endpoint"')
 
                             echo "clusterIp : $clusterIP"
                             clusterPublicIP=${clusterIP:1:-6}
@@ -468,8 +468,7 @@ EOF
                         echo "getting MountTarget ID"
                         mount_target_id=${MOUNT_TARGET_OCID}
 
-                        clusterIP=$(oci ce cluster list --compartment-id=${compartment_id} | jq '.data[]  | select(."name" == '\"${CLUSTER_NAME}\"' and (."lifecycle-state" == "ACTIVE"))' | jq ' ."endpoints" | ."public-endpoint"')
-
+                        clusterIP=$(oci ce cluster list --compartment-id=${compartment_id} | jq '.data[]  | select(."name" == "'"${CLUSTER_NAME}"'" and (."lifecycle-state" == "ACTIVE"))' | jq ' ."endpoints" | ."public-endpoint"')
                         echo "clusterIp : $clusterIP"
                         clusterPublicIP=${clusterIP:1:-6}
                         echo " clusterPublicIP : ${clusterPublicIP}"
@@ -530,7 +529,7 @@ EOF
                                 touch ${WORKSPACE}/.mvn/maven.config
                                 export KUBECONFIG=${kubeconfig_file}
 
-                                clusterIP=$(oci ce cluster list --compartment-id=${compartment_id} | jq '.data[]  | select(."name" == '\"${CLUSTER_NAME}\"' and (."lifecycle-state" == "ACTIVE"))' | jq ' ."endpoints" | ."public-endpoint"')
+                                clusterIP=$(oci ce cluster list --compartment-id=${compartment_id} | jq '.data[]  | select(."name" == "'"${CLUSTER_NAME}"'" and (."lifecycle-state" == "ACTIVE"))' | jq ' ."endpoints" | ."public-endpoint"')
                                 echo "clusterIp : $clusterIP"
                                 clusterPublicIP=${clusterIP:1:-6}
                                 echo " clusterPublicIP : ${clusterPublicIP}"

integration-tests/src/test/resources/oke/terraform/okemodule/oke.create.sh

@@ -84,13 +84,32 @@ createRoleBindings () {
 checkClusterRunning () {
 
     echo "Confirm we have ${KUBERNETES_CLI:-kubectl} working..."
-    myline=`${KUBERNETES_CLI:-kubectl} get nodes | awk '{print $2}'| tail -n+2`
-    status="NotReady"
-    max=50
-    count=1
-
-    privateIP=${vcn_cidr_prefix//./\\.}\\.10\\.
     privateIP=${vcn_cidr_prefix}
+    myline_output=$(${KUBERNETES_CLI:-kubectl} get nodes -o wide 2>&1)
+    if echo "$myline_output" | grep -q "Unable to connect to the server: net/http: TLS handshake timeout"; then
+        echo "[ERROR] Unable to connect to the server: net/http: TLS handshake timeout"
+
+        echo '- could not talk to OKE cluster, aborting'
+        cd ${terraformVarDir}
+        terraform destroy -auto-approve -var-file=${terraformVarDir}/${clusterTFVarsFile}.tfvars
+        terraform apply -auto-approve -var-file=${terraformVarDir}/${clusterTFVarsFile}.tfvars
+        echo "retrying to execute KUBERNETES_CLI"
+        clusterIP=$(oci ce cluster list --compartment-id=${compartment_ocid} | jq '.data[]  | select(."name" == '"${okeclustername}"' and (."lifecycle-state" == "ACTIVE"))' | jq ' ."endpoints" | ."public-endpoint"')
+        echo "clusterIp : $clusterIP"
+        clusterPublicIP=${clusterIP:1:-6}
+        echo " clusterPublicIP : ${clusterPublicIP}"
+        echo "NO_PROXY before : ${NO_PROXY}"
+        export NO_PROXY=${clusterPublicIP}
+        echo "NO_PROXY:" $NO_PROXY
+        myline_output=$(${KUBERNETES_CLI:-kubectl} get nodes -o wide 2>&1)
+        if echo "$myline_output" | grep -q "Unable to connect to the server: net/http: TLS handshake timeout"; then
+                echo "[ERROR] Unable to connect to the server: net/http: TLS handshake timeout"
+                echo '- could not talk to OKE cluster, aborting'
+                cd ${terraformVarDir}
+                terraform destroy -auto-approve -var-file=${terraformVarDir}/${clusterTFVarsFile}.tfvars
+                exit 1
+        fi
+    fi
     declare -a myline
     myline=(`${KUBERNETES_CLI:-kubectl} get nodes -o wide | grep "${privateIP}" | awk '{print $2}'`)
     NODE_IP=`${KUBERNETES_CLI:-kubectl} get nodes -o wide| grep "${privateIP}" | awk '{print $7}'`
@@ -116,7 +135,7 @@ checkClusterRunning () {
     if [ "$NODES" == "2" ]; then
       echo '- looks good'
     else
-      echo '- could not talk to cluster, aborting'
+      echo '- could not talk to OKE cluster, aborting'
       cd ${terraformVarDir}
       terraform destroy -auto-approve -var-file=${terraformVarDir}/${clusterTFVarsFile}.tfvars
       exit 1
@@ -183,15 +202,15 @@ export KUBECONFIG=${terraformVarDir}/${okeclustername}_kubeconfig
 export okeclustername=\"${okeclustername}\"
 
 
- echo " oci ce cluster list --compartment-id=${compartment_ocid} | jq '.data[]  | select(."name" == '"${okeclustername}"' and (."lifecycle-state" == "ACTIVE"))' | jq ' ."endpoints" | ."public-endpoint"'"
+echo " oci ce cluster list --compartment-id=${compartment_ocid} | jq '.data[]  | select(."name" == '"${okeclustername}"' and (."lifecycle-state" == "ACTIVE"))' | jq ' ."endpoints" | ."public-endpoint"'"
 
 clusterIP=$(oci ce cluster list --compartment-id=${compartment_ocid} | jq '.data[]  | select(."name" == '"${okeclustername}"' and (."lifecycle-state" == "ACTIVE"))' | jq ' ."endpoints" | ."public-endpoint"')
 echo "clusterIp : $clusterIP"
 clusterPublicIP=${clusterIP:1:-6}
 echo " clusterPublicIP : ${clusterPublicIP}"
-export NO_PROXY=$NO_PROXY,${clusterPublicIP}
+echo "NO_PROXY before : ${NO_PROXY}"
+export NO_PROXY=${clusterPublicIP}
 echo "NO_PROXY:" $NO_PROXY
 
-
 checkClusterRunning
 echo "$okeclustername is up and running}"