Update to k8s 1.13, helm 2.14 (#300)

dtzar · rguthriemsft · commit 95d70687adb3 · 2019-06-18T10:44:24.000-07:00
* k8s to 1.13.5

* Bump Helm 2.14.1

* Bump az cli version

* --mount to -v

* Fix readme

* --mount to -v

* echo ingress IP prior to creating FW rule.

* Fix volume mount syntax
diff --git a/provision-team/configure_sql.sh b/provision-team/configure_sql.sh
@@ -80,11 +80,15 @@ STAGE_INGRESS_IP=$(kubectl get svc team-ingress-stage-traefik -o jsonpath='{.sta
 # Get the name of the SQL server
 sqlServer=$(az keyvault secret show --vault-name $keyVaultName --name sqlServerName -o tsv --query value)
 
+echo -e "\n\nAdding SQL Server Firewall rule to allow $INGRESS_IP."
+
 # Add firewall rule to allow APIs to connect to SQL server database
 az sql server firewall-rule create -n allow-k8s-ingress -g $resourceGroupName -s $sqlServer --start-ip-address $INGRESS_IP --end-ip-address $INGRESS_IP
 
 echo -e "\n\nSQL Server Firewall rule added to allow $INGRESS_IP."
 
+echo -e "\n\nAdding SQL Server Firewall rule to allow staging $STAGE_INGRESS_IP."
+
 # Add firewall rule to allow staging APIs to connect to SQL server database
 az sql server firewall-rule create -n allow-k8s-ingress-stage -g $resourceGroupName -s $sqlServer --start-ip-address $STAGE_INGRESS_IP --end-ip-address $STAGE_INGRESS_IP
 
diff --git a/provision-team/jenkins/install_jenkins.sh b/provision-team/jenkins/install_jenkins.sh
@@ -485,19 +485,19 @@ sudo service jenkins restart
 retry_until_successful run_util_script "jenkins/run-cli-command.sh" -c "version"
 
 echo "############### Installing Packages ###############"
-sudo DEBIAN_FRONTEND=noninteractive apt-get install -y jq git zip azure-cli=2.0.49-1~xenial
+sudo DEBIAN_FRONTEND=noninteractive apt-get install -y jq git zip azure-cli=2.0.66-1~xenial
 sudo DEBIAN_FRONTEND=noninteractive apt-get install -y docker-ce
 
 # Kubectl
 echo "############### Installing kubectl ###############"
-curl -s -LO https://storage.googleapis.com/kubernetes-release/release/v1.11.8/bin/linux/amd64/kubectl
+curl -s -LO https://storage.googleapis.com/kubernetes-release/release/v1.13.7/bin/linux/amd64/kubectl
 chmod +x ./kubectl
 sudo mv ./kubectl /usr/local/bin/kubectl
 
-# Helm v2.11.0
-echo "############### Installing Helm v2.11.0 ###############"
-sudo curl -s -O https://storage.googleapis.com/kubernetes-helm/helm-v2.11.0-linux-amd64.tar.gz
-sudo tar -zxvf helm-v2.11.0-linux-amd64.tar.gz
+# Helm v2.14.1
+echo "############### Installing Helm v2.14.1 ###############"
+sudo curl -s -O https://storage.googleapis.com/kubernetes-helm/helm-v2.14.1-linux-amd64.tar.gz
+sudo tar -zxvf helm-v2.14.1-linux-amd64.tar.gz
 sudo mv linux-amd64/helm /usr/local/bin/helm
 
 # Configure accessusermod -aG docker azureuser
diff --git a/provision-team/provision_aks.sh b/provision-team/provision_aks.sh
@@ -129,7 +129,7 @@ fi
 echo "Creating AKS Cluster..."
 (
     set -x
-    az aks create -g $resourceGroupName -n $clusterName -l $resourceGroupLocation --node-count 3 --generate-ssh-keys -k 1.11.8 --service-principal $SP_ID --client-secret $SP_PASS
+    az aks create -g $resourceGroupName -n $clusterName -l $resourceGroupLocation --node-count 3 --generate-ssh-keys -k 1.13.5 --service-principal $SP_ID --client-secret $SP_PASS
 )
 
 if [ $? == 0 ];
diff --git a/provision-vm/Docker/Dockerfile b/provision-vm/Docker/Dockerfile
@@ -26,21 +26,21 @@ RUN add-apt-repository "deb [arch=amd64] https://packages.microsoft.com/ubuntu/1
 # Add Docker source
 RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu xenial stable"
 
-############### Installing Helm v2.12.3 ###############
-RUN curl -s -O https://storage.googleapis.com/kubernetes-helm/helm-v2.12.3-linux-amd64.tar.gz
-RUN tar -zxvf helm-v2.12.3-linux-amd64.tar.gz
+############### Installing Helm v2.14.1 ###############
+RUN curl -s -O https://storage.googleapis.com/kubernetes-helm/helm-v2.14.1-linux-amd64.tar.gz
+RUN tar -zxvf helm-v2.14.1-linux-amd64.tar.gz
 RUN mv linux-amd64/helm /usr/local/bin/helm
 
 ############### Installing kubectl ###############
-RUN curl -s -LO https://storage.googleapis.com/kubernetes-release/release/v1.11.8/bin/linux/amd64/kubectl
+RUN curl -s -LO https://storage.googleapis.com/kubernetes-release/release/v1.13.7/bin/linux/amd64/kubectl
 RUN chmod +x ./kubectl
 RUN mv ./kubectl /usr/local/bin/kubectl
 
 ############### Installing Packages ###############
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y apt-transport-https
 RUN DEBIAN_FRONTEND=noninteractive apt-get update
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y dotnet-sdk-2.2 jq git zip azure-cli=2.0.49-1~xenial
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y dotnet-sdk-2.2 jq git zip azure-cli=2.0.66-1~xenial
 RUN DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get install -y mssql-tools unixodbc-dev
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y docker-ce
 RUN DEBIAN_FRONTEND=noninteractive apt-get install vim -y
diff --git a/provision-vm/Docker/Readme.md b/provision-vm/Docker/Readme.md
@@ -8,7 +8,7 @@ For getting started, create a docker daemon using the docker image. For experime
 If you want to run the container locally:
 
 ```
-$ docker run --mount '"'"'type=bind,src=/home/nginx/config,dst=/home/nginx/config'"'"' --mount '"'"'type=bind,src=/home/nginx/contents,dst=/home/nginx/contents'"'"' --mount '"'"'type=bind,src=/home/azureuser/logs,dst=/home/azureuser/logs'"'"' -v /var/run/docker.sock:/var/run/docker.sock -d -e  AZUREUSERNAME -e AZUREPASSWORD -e SUBID -e LOCATION -e TEAMNAME -e RECIPIENTEMAIL -e CHATCONNECTIONSTRING -e CHATMESSAGEQUEUE -e TENANTID -e APPID devopsoh/proctor-container
+$ docker run -v '"'"'type=bind,src=/home/nginx/config,dst=/home/nginx/config'"'"' -v '"'"'type=bind,src=/home/nginx/contents,dst=/home/nginx/contents'"'"' -v '"'"'type=bind,src=/home/azureuser/logs,dst=/home/azureuser/logs'"'"' -v /var/run/docker.sock:/var/run/docker.sock -d -e  AZUREUSERNAME -e AZUREPASSWORD -e SUBID -e LOCATION -e TEAMNAME -e RECIPIENTEMAIL -e CHATCONNECTIONSTRING -e CHATMESSAGEQUEUE -e TENANTID -e APPID devopsoh/proctor-container
 root@531ed021c2c5:/home/azureuser# export AZUREUSERNAME=YOUR_SERVICE_PRINICPAL_NAME
 root@531ed021c2c5:/home/azureuser# export AZUREPASSWORD=YOUR_SERVICE_PRINICPAL_PASSWORD
 root@531ed021c2c5:/home/azureuser# export SUBID=YOUR_SUBSCRIPTION_ID
@@ -19,6 +19,7 @@ root@531ed021c2c5:/home/azureuser# export CHATCONNECTIONSTRING=null
 root@531ed021c2c5:/home/azureuser# export CHATMESSAGEQUEUE=null
 root@531ed021c2c5:/home/azureuser# export TENANTID=YOUR_TENANT_ID
 root@531ed021c2c5:/home/azureuser# export APPID=YOUR_SERVICE_PRINICPAL_APP_ID
+root@531ed021c2c5:/home/azureuser# export GITBRANCH=master
 root@531ed021c2c5:/home/azureuser# chmod +x ./startup.sh
-root@531ed021c2c5:/home/azureuser# ./start.sh
+root@531ed021c2c5:/home/azureuser# ./startup.sh
 ```
diff --git a/provision-vm/proctorVMSetup.sh b/provision-vm/proctorVMSetup.sh
@@ -76,5 +76,5 @@ mkdir -p /home/nginx/contents
 mkdir -p /home/azureuser/logs
 
 # /bin/bash -c 'docker run -d --name docker-daemon --privileged docker:stable-dind &'
-/bin/bash -c 'docker run -v '"'"'type=bind,src=/home/nginx/config,dst=/home/nginx/config'"'"' --mount '"'"'type=bind,src=/home/nginx/contents,dst=/home/nginx/contents'"'"' --mount '"'"'type=bind,src=/home/azureuser/logs,dst=/home/azureuser/logs'"'"' -v /var/run/docker.sock:/var/run/docker.sock -d -e  AZUREUSERNAME -e AZUREPASSWORD -e SUBID -e LOCATION -e TEAMNAME -e RECIPIENTEMAIL -e CHATCONNECTIONSTRING -e CHATMESSAGEQUEUE -e TENANTID -e APPID -e GITBRANCH devopsoh/proctor-container &'
+/bin/bash -c 'docker run -v /home/nginx/config:/home/nginx/config -v /home/nginx/contents:/home/nginx/contents -v /home/azureuser/logs:/home/azureuser/logs -v /var/run/docker.sock:/var/run/docker.sock -d -e  AZUREUSERNAME -e AZUREPASSWORD -e SUBID -e LOCATION -e TEAMNAME -e RECIPIENTEMAIL -e CHATCONNECTIONSTRING -e CHATMESSAGEQUEUE -e TENANTID -e APPID -e GITBRANCH devopsoh/proctor-container &'
 #echo "############### End of custom script ###############"

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ fi`
`129`	`129`	`echo "Creating AKS Cluster..."`
`130`	`130`	`(`
`131`	`131`	`set -x`
`132`		`- az aks create -g $resourceGroupName -n $clusterName -l $resourceGroupLocation --node-count 3 --generate-ssh-keys -k 1.11.8 --service-principal $SP_ID --client-secret $SP_PASS`
	`132`	`+ az aks create -g $resourceGroupName -n $clusterName -l $resourceGroupLocation --node-count 3 --generate-ssh-keys -k 1.13.5 --service-principal $SP_ID --client-secret $SP_PASS`
`133`	`133`	`)`
`134`	`134`
`135`	`135`	`if [ $? == 0 ];`