Merge branch 'develop' into support-apache-load-balancer

Author: rjeberhard

kubernetes/create-weblogic-domain-inputs.yaml

@@ -89,7 +89,7 @@ exposeAdminNodePort: false
 # Name of the domain namespace
 namespace: default
 
-# Load balancer to deploy.  Supported values are: TRAEFIK, APACHE, NONE
+# Load balancer to deploy.  Supported values are: APACHE, TRAEFIK, VOYAGER, NONE
 loadBalancer: TRAEFIK
 
 # Load balancer app prepath used for APACHE load balancer 

kubernetes/delete-weblogic-domain-resources.sh

@@ -53,7 +53,6 @@ cat << EOF
 EOF
 }
 
-
 #
 # getDomainResources domain(s) outfilename
 #
@@ -75,8 +74,12 @@ function getDomainResources {
     LABEL_SELECTOR="weblogic.domainUID in ($1)"
   fi
 
-  # first, let's get all namespaced types with -l $LABEL_SELECTOR
+  # clean the output file
+  if [ -e $2 ]; then
+    rm $2
+  fi
 
+  # first, let's get all namespaced types with -l $LABEL_SELECTOR
   NAMESPACED_TYPES="pod,job,deploy,rs,service,pvc,ingress,cm,serviceaccount,role,rolebinding,secret"
 
   # if domain crd exists, look for domains too:
@@ -85,10 +88,15 @@ function getDomainResources {
     NAMESPACED_TYPES="domain,$NAMESPACED_TYPES"
   fi
 
+  VOYAGER_ING_NAME="ingresses.voyager.appscode.com"
+  if [ `kubectl get crd $VOYAGER_ING_NAME |grep $VOYAGER_ING_NAME | wc -l` = 1 ]; then
+    NAMESPACED_TYPES="$VOYAGER_ING_NAME,$NAMESPACED_TYPES"
+  fi
+
   kubectl get $NAMESPACED_TYPES \
           -l "$LABEL_SELECTOR" \
           -o=jsonpath='{range .items[*]}{.kind}{" "}{.metadata.name}{" -n "}{.metadata.namespace}{"\n"}{end}' \
-          --all-namespaces=true > $2
+          --all-namespaces=true >> $2
 
   # now, get all non-namespaced types with -l $LABEL_SELECTOR
 
@@ -196,9 +204,9 @@ function deleteDomains {
     # for each namespace with leftover resources, try delete them
     cat $tempfile | awk '{ print $4 }' | grep -v "^$" | sort -u | while read line; do 
       if [ "$test_mode" = "true" ]; then
-        echo kubectl -n $line delete $NAMESPACED_TYPES -l "$LABEL_SELECTOR" 
+        echo kubectl -n $line delete $NAMESPACED_TYPES -l "$LABEL_SELECTOR"
       else
-        kubectl -n $line delete $NAMESPACED_TYPES -l "$LABEL_SELECTOR" 
+        kubectl -n $line delete $NAMESPACED_TYPES -l "$LABEL_SELECTOR"
       fi
     done
 
@@ -260,3 +268,4 @@ if [ ! -x "$(command -v kubectl)" ]; then
 fi
 
 deleteDomains "${domains}" "${maxwaitsecs:-$default_maxwaitsecs}"
+

kubernetes/internal/create-weblogic-domain.sh

@@ -188,10 +188,12 @@ function validateLoadBalancer {
       ;;
       "APACHE")
       ;;
+      "VOYAGER")
+      ;;
       "NONE")
       ;;
       *)
-        validationError "Invalid value for loadBalancer: ${loadBalancer}. Valid values are TRAEFIK, APACHE and NONE."
+        validationError "Invalid value for loadBalancer: ${loadBalancer}. Valid values are APACHE, TRAEFIK, VOYAGER and NONE."
       ;;
     esac
   fi
@@ -352,6 +354,10 @@ function initialize {
   apacheInput="${scriptDir}/weblogic-domain-apache-template.yaml"
   if [ ! -f ${apacheInput} ]; then
     validationError "The template file ${apacheInput} for generating the apache-webtier deployment was not found"
+
+  voyagerInput="${scriptDir}/voyager-ingress-template.yaml"
+  if [ ! -f ${voyagerInput} ]; then
+    validationError "The template file ${voyagerInput} for generating the Voyager Ingress was not found"
   fi
 
   failIfValidationErrors
@@ -424,7 +430,7 @@ function createYamlFiles {
   traefikOutput="${domainOutputDir}/weblogic-domain-traefik-${clusterNameLC}.yaml"
   apacheOutput="${domainOutputDir}/weblogic-domain-apache.yaml"
   apacheSecurityOutput="${domainOutputDir}/weblogic-domain-apache-security.yaml"
-
+  voyagerOutput="${domainOutputDir}/voyager-ingress.yaml"
 
   enabledPrefix=""     # uncomment the feature
   disabledPrefix="# "  # comment out the feature
@@ -531,8 +537,9 @@ function createYamlFiles {
     sed -i -e "s:%DOMAIN_NAME%:${domainName}:g" ${traefikSecurityOutput}
     sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${traefikSecurityOutput}
     sed -i -e "s:%CLUSTER_NAME_LC%:${clusterNameLC}:g" ${traefikSecurityOutput}
+  fi
 
-  elif [ "${loadBalancer}" = "APACHE" ]; then
+  if [ "${loadBalancer}" = "APACHE" ]; then
     # Apache file
     cp ${apacheInput} ${apacheOutput}
     echo Generating ${apacheOutput}
@@ -565,6 +572,19 @@ function createYamlFiles {
     sed -i -e "s:%DOMAIN_NAME%:${domainName}:g" ${apacheSecurityOutput}
   fi
 
+  if [ "${loadBalancer}" = "VOYAGER" ]; then
+    # Voyager Ingress file
+    cp ${voyagerInput} ${voyagerOutput}
+    echo Generating ${voyagerOutput}
+    sed -i -e "s:%NAMESPACE%:$namespace:g" ${voyagerOutput}
+    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:%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}
+  fi
+
   # Remove any "...yaml-e" files left over from running sed
   rm -f ${domainOutputDir}/*.yaml-e
 }
@@ -656,6 +676,59 @@ function createDomain {
 
 }
 
+#
+# Deploy Voyager/HAProxy load balancer
+#
+function setupVoyagerLoadBalancer {
+  # only deploy Voyager Ingress Controller the first time
+  local vpod=`kubectl get pod -n voyager | grep voyager | wc -l`
+  if [ "$vpod" == "0" ]; then
+    kubectl create namespace voyager
+    curl -fsSL https://raw.githubusercontent.com/appscode/voyager/6.0.0/hack/deploy/voyager.sh \
+    | bash -s -- --provider=baremetal --namespace=voyager
+  fi
+
+  # verify Voyager controller pod is ready
+  local ready=`kubectl -n voyager get pod | grep voyager-operator | awk ' { print $2; } '`
+  if [ "${ready}" != "1/1" ] ; then
+    fail "Voyager Ingress Controller is not ready"
+  fi
+
+  # 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
+}
 #
 # Deploy traefik load balancer
 #
@@ -798,7 +871,7 @@ function outputJobSummary {
   if [ "${exposeAdminT3Channel}" = true ]; then
     echo "T3 access is available at t3:${K8S_IP}:${t3ChannelPort}"
   fi
-  if [ "${loadBalancer}" = "TRAEFIK" ]; then
+  if [ "${loadBalancer}" = "TRAEFIK" ] || [ "${loadBalancer}" = "VOYAGER" ]; then
     echo "The load balancer for cluster '${clusterName}' is available at http:${K8S_IP}:${loadBalancerWebPort}/ (add the application path to the URL)"
     echo "The load balancer dashboard for cluster '${clusterName}' is available at http:${K8S_IP}:${loadBalancerDashboardPort}"
     echo ""
@@ -818,7 +891,8 @@ function outputJobSummary {
   elif [ "${loadBalancer}" = "APACHE" ]; then
     echo "  ${apacheSecurityOutput}"
     echo "  ${apacheOutput}"
-
+  elif [ "${loadBalancer}" = "VOYAGER" ]; then
+    echo "  ${voyagerOutput}"
   fi
 }
 
@@ -851,7 +925,8 @@ if [ "${generateOnly}" = false ]; then
     setupTraefikLoadBalancer
   elif [ "${loadBalancer}" = "APACHE" ]; then
     setupApacheLoadBalancer
-
+  elif [ "${loadBalancer}" = "VOYAGER" ]; then
+    setupVoyagerLoadBalancer
   fi
 
   # Create the domain custom resource

kubernetes/internal/voyager-ingress-template.yaml

@@ -0,0 +1,42 @@
+apiVersion: voyager.appscode.com/v1beta1
+kind: Ingress
+metadata:
+  name: %DOMAIN_UID%-voyager
+  namespace: %NAMESPACE%
+  labels:
+    weblogic.domainUID: %DOMAIN_UID%
+    weblogic.domainName: %DOMAIN_NAME%
+  annotations:
+    ingress.appscode.com/type: 'NodePort'
+    ingress.appscode.com/stats: 'true'
+spec:
+  rules:
+  - host: %DOMAIN_UID%.%CLUSTER_NAME%
+    http:
+      nodePort: '%LOAD_BALANCER_WEB_PORT%'
+      paths:
+      - backend:
+          serviceName: %DOMAIN_UID%-cluster-%CLUSTER_NAME%
+          servicePort: '%MANAGED_SERVER_PORT%'
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: %DOMAIN_UID%-voyager-stats
+  namespace: %NAMESPACE%
+  labels:
+    app: %DOMAIN_UID%-voyager-stats
+    weblogic.domainUID: %DOMAIN_UID%
+    weblogic.domainName: %DOMAIN_NAME%
+spec:
+  type: NodePort
+  ports:
+    - name: client
+      protocol: TCP
+      port: 56789
+      targetPort: 56789
+      nodePort: %LOAD_BALANCER_DASHBOARD_PORT%
+  selector:
+    origin: voyager
+    origin-name: %DOMAIN_UID%-voyager