handle uppercase of clusterName when setting up Voyager

Author: Lily He

kubernetes/internal/create-weblogic-domain.sh

@@ -581,6 +581,7 @@ function createYamlFiles {
     sed -i -e "s:%DOMAIN_UID%:${domainUID}:g" ${voyagerOutput}
     sed -i -e "s:%DOMAIN_NAME%:${domainName}:g" ${voyagerOutput}
     sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${voyagerOutput}
+    sed -i -e "s:%CLUSTER_NAME_LC%:${clusterNameLC}:g" ${voyagerOutput}
     sed -i -e "s:%MANAGED_SERVER_PORT%:${managedServerPort}:g" ${voyagerOutput}
     sed -i -e "s:%LOAD_BALANCER_WEB_PORT%:$loadBalancerWebPort:g" ${voyagerOutput}
     sed -i -e "s:%LOAD_BALANCER_DASHBOARD_PORT%:$loadBalancerDashboardPort:g" ${voyagerOutput}
@@ -698,38 +699,55 @@ function setupVoyagerLoadBalancer {
   # deploy Voyager Ingress resource
   kubectl apply -f ${voyagerOutput}
 
-    echo Checking Voyager Ingress resource
-    local maxwaitsecs=100
-    local mstart=`date +%s`
-    while : ; do
-      local mnow=`date +%s`
-      local vdep=`kubectl get ingresses.voyager.appscode.com -n ${namespace} | grep ${domainUID}-voyager | wc | awk ' { print $1; } '`
-      if [ "$vdep" = "1" ]; then
-        echo 'The Voyager Ingress resource ${domainUID}-voyager is created successfully.'
-        break
-      fi
-      if [ $((mnow - mstart)) -gt $((maxwaitsecs)) ]; then
-        fail "The Voyager Ingress resource ${domainUID}-voyager was not created."
-      fi
-      sleep 5
-    done
-
-    echo Checking Voyager service
-    local maxwaitsecs=100
-    local mstart=`date +%s`
-    while : ; do
-      local mnow=`date +%s`
-      local vscv=`kubectl get service ${domainUID}-voyager-stats -n ${namespace} | grep ${domainUID}-voyager-stats | wc | awk ' { print $1; } '`
-      if [ "$vscv" = "1" ]; then
-        echo 'The service ${domainUID}-voyager-stats is created successfully.'
-        break
-      fi
-      if [ $((mnow - mstart)) -gt $((maxwaitsecs)) ]; then
-        fail "The service ${domainUID}-voyager-stats was not created."
-      fi
-      sleep 5
-    done
+  echo Checking Voyager Ingress resource
+  local maxwaitsecs=100
+  local mstart=`date +%s`
+  while : ; do
+    local mnow=`date +%s`
+    local vdep=`kubectl get ingresses.voyager.appscode.com -n ${namespace} | grep ${domainUID}-voyager | wc | awk ' { print $1; } '`
+    if [ "$vdep" = "1" ]; then
+      echo 'The Voyager Ingress resource ${domainUID}-voyager is created successfully.'
+      break
+    fi
+    if [ $((mnow - mstart)) -gt $((maxwaitsecs)) ]; then
+      fail "The Voyager Ingress resource ${domainUID}-voyager was not created."
+    fi
+    sleep 5
+  done
+
+  echo Checking HAProxy pod is running
+  local maxwaitsecs=100
+  local mstart=`date +%s`
+  while : ; do
+    local mnow=`date +%s`
+    local st=`kubectl get pod -n ${namespace} | grep ^voyager-${domainUID}-voyager- | awk ' { print $3; } '`
+    if [ "$st" = "Running" ]; then
+      echo 'The HAProxy pod for Voyaer Ingress ${domainUID}-voyager is created successfully.'
+      break
+    fi
+    if [ $((mnow - mstart)) -gt $((maxwaitsecs)) ]; then
+      fail "The HAProxy pod for Voyaer Ingress ${domainUID}-voyager  was not created or running."
+    fi
+    sleep 5
+  done
+
+  echo Checking Voyager service
+  local maxwaitsecs=100
+  local mstart=`date +%s`
+  while : ; do
+    local mnow=`date +%s`
+    local vscv=`kubectl get service ${domainUID}-voyager-stats -n ${namespace} | grep ${domainUID}-voyager-stats | wc | awk ' { print $1; } '`
+    if [ "$vscv" = "1" ]; then
+      echo 'The service ${domainUID}-voyager-stats is created successfully.'
+      break
+    fi
+    if [ $((mnow - mstart)) -gt $((maxwaitsecs)) ]; then
+      fail "The service ${domainUID}-voyager-stats was not created."
+    fi
+    sleep 5
+  done
 }
+
 #
 # Deploy traefik load balancer
 #

kubernetes/internal/voyager-ingress-template.yaml

@@ -16,7 +16,7 @@ spec:
       nodePort: '%LOAD_BALANCER_WEB_PORT%'
       paths:
       - backend:
-          serviceName: %DOMAIN_UID%-cluster-%CLUSTER_NAME%
+          serviceName: %DOMAIN_UID%-cluster-%CLUSTER_NAME_LC%
           servicePort: '%MANAGED_SERVER_PORT%'
 
 ---