Autolab config update and fixing env variable output (#75)

Author: apcurrier

auto-lab.sh

@@ -100,7 +100,7 @@ kubectl_apply
 create_nsg_rule_aks
 
 echo 
-echo "Lab2 & Lab3 infrastructure creation completed!"
+echo "Lab3 infrastructure creation completed!"
 echo 
 }
 
@@ -114,7 +114,7 @@ upload_archive
 update_hosts_file
 
 echo 
-echo "Lab2, Lab3 & Lab4 infrastructure creation completed!"
+echo "Lab4 infrastructure creation completed!"
 echo 
 }
 
@@ -155,14 +155,25 @@ echo "All infrastructure creation completed!"
 echo 
 }
 
+## LabTest
+function labtest(){
+azcli_test
+nginx_ext_test
+nginx_jwt_test
+
+echo 
+echo "Testing of lab conditions completed."
+echo 
+}
+
 # How to use the script
 DELETE=0
-OPTSTRING=":adehl:"
+OPTSTRING=":adehtl:n:"
 
 function usage {
 cat <<EOT
 Usage:
-        $NAME [-l <number>] [-a] [-d] [-h]
+        $NAME [-l <number>] [-n MY_NAME][-a] [-d] [-h]
 Purpose:
         In Azure, build the labs for the NGINXaaS workshop. 
         - Must have valid NGINX Plus JWT in Lab 3 folder.
@@ -175,11 +186,13 @@ Inputs:
             on top of each other (there are dependencies), so prior labs will be 
             built.
       -a
-            Build lab2, 3 and 4. All labs will be built sequentially.
+            Build lab2, 3 or 4. All labs should be built sequentially.
       -d
             Delete the whole resource group (will ask for confirmation)
       -h
             Display this usage help text
+      -t
+            Test basic environment setup to be sure the script can run.
 
 EOT
 }
@@ -202,10 +215,14 @@ while getopts ${OPTSTRING} opt; do
       echo "Option -e was triggered, building everything!"
       LAB=99
       ;;
-     h)
+    h)
       echo "Option -h was triggered, running usage"
       USAGE=1
       ;;
+    t)
+      echo "Option -t was triggered, running tests"
+      TEST=1
+      ;;
     :)
       echo "Option -${OPTARG} requires an argument."
       exit 1
@@ -249,6 +266,9 @@ function main() {
     elif [[ $USAGE == 1 ]]; then
         clear
         usage
+    elif [[ $TEST == 1 ]]; then
+        clear
+        labtest
     else 
         echo "Nothing to do!" 
     fi

functions.sh

@@ -810,8 +810,19 @@ az group delete --name $MY_RESOURCEGROUP
 }
 
 function display(){
-# Display more variable values that we used in the script.
-# Per instructions, copy output and pastr back to teh terminal so we have these moving forward.
+# Display more variable values that we used in the script.  
+# Per instructions, copy output and paste back to the terminal so we have these moving forward.
+
+export MY_N4A_ID=$(az nginx deployment show --resource-group $MY_RESOURCEGROUP --name nginx4a --query id --output tsv)
+export MY_LOG_ANALYTICS_ID=`az monitor log-analytics workspace show --resource-group $MY_RESOURCEGROUP --name n4a-loganalytics --query id --output tsv`
+kubectl config use-context n4a-aks1
+export AKS1_NIC=$(kubectl get pods -n nginx-ingress -o jsonpath='{.items[0].metadata.name}')
+kubectl config use-context n4a-aks2
+export AKS2_NIC=$(kubectl get pods -n nginx-ingress -o jsonpath='{.items[0].metadata.name}')
+export MY_AZURE_PUBLIC_IP=$(az network public-ip show --resource-group $MY_RESOURCEGROUP --name $MY_AZURE_PUBLIC_IP_NAME --query ipAddress --output tsv)
+export UBUNTU_VM_PUBLICIP=$(az vm show -d -g $MY_RESOURCEGROUP -n n4a-ubuntuvm --query publicIps -o tsv)
+export WINDOWS_VM_PUBLICIP=$(az vm show -d -g $MY_RESOURCEGROUP -n n4a-windowsvm --query publicIps -o tsv)
+
 cat <<EOI
 export MY_N4A_ID=$MY_N4A_ID
 export MY_LOG_ANALYTICS_ID=$MY_LOG_ANALYTICS_ID

n4a-configs/etc/nginx/conf.d/aks1-upstreams.conf

@@ -6,9 +6,9 @@ upstream aks1_ingress {
   # from nginx-ingress NodePort Service / aks Node names
   # Note: change servers to match
   #
-  server aks-nodepool1-_AKS1_NODES_-vmss000000:32090;    #aks1 node1
-  server aks-nodepool1-_AKS1_NODES_-vmss000001:32090;    #aks1 node2
-  server aks-nodepool1-_AKS1_NODES_-vmss000002:32090;    #aks1 node3
+  server aks-nodepool1-_AKS1_NODES_-vmss000000:32080;    #aks1 node1
+  server aks-nodepool1-_AKS1_NODES_-vmss000001:32080;    #aks1 node2
+  server aks-nodepool1-_AKS1_NODES_-vmss000002:32080;    #aks1 node3
 
   keepalive 32;
 

n4a-configs/etc/nginx/conf.d/aks2-upstreams.conf

@@ -6,10 +6,10 @@ upstream aks2_ingress {
   # from nginx-ingress NodePort Service / aks Node names
   # Note: change servers to match
   #
-  server aks-nodepool1-_AKS2_NODES_-vmss000000:32090;    #aks2 node1
-  server aks-nodepool1-_AKS2_NODES_-vmss000001:32090;    #aks2 node2
-  server aks-nodepool1-_AKS2_NODES_-vmss000002:32090;    #aks2 node3
-  server aks-nodepool1-_AKS2_NODES_-vmss000003:32090;    #aks2 node4
+  server aks-nodepool1-_AKS2_NODES_-vmss000000:32080;    #aks2 node1
+  server aks-nodepool1-_AKS2_NODES_-vmss000001:32080;    #aks2 node2
+  server aks-nodepool1-_AKS2_NODES_-vmss000002:32080;    #aks2 node3
+  server aks-nodepool1-_AKS2_NODES_-vmss000003:32080;    #aks2 node4
 
   keepalive 32;