Maintenance/aks update to 1.17.11 (#338)

* Updating kubernetes version to 1.17.11 * Update kubernetes version to 1.17.11 * bump .11 * Update kubectl vs to 1.17.11 * Bump helm version from v2.14.3 to v2.17.0 * Bump az cli from 2.0.71 to 2.14.1
Azure-Samples · Nov 11, 2020 · 3f58a4c · 3f58a4c
1 parent 166d949
commit 3f58a4c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/provision-team/jenkins/install_jenkins.sh b/provision-team/jenkins/install_jenkins.sh
@@ -485,17 +485,17 @@ 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.71-1~xenial
+sudo DEBIAN_FRONTEND=noninteractive apt-get install -y jq git zip azure-cli=2.14.1-1~xenial
 sudo DEBIAN_FRONTEND=noninteractive apt-get install -y docker-ce
 
 echo "############### Installing kubectl ###############"
-curl -s -LO https://storage.googleapis.com/kubernetes-release/release/v1.15.10/bin/linux/amd64/kubectl
+curl -s -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.11/bin/linux/amd64/kubectl
 chmod +x ./kubectl
 sudo mv ./kubectl /usr/local/bin/kubectl
 
-echo "############### Installing Helm v2.14.3 ###############"
-sudo curl -s -O https://storage.googleapis.com/kubernetes-helm/helm-v2.14.3-linux-amd64.tar.gz
-sudo tar -zxvf helm-v2.14.3-linux-amd64.tar.gz
+echo "############### Installing Helm v2.17.0 ###############"
+sudo curl -s -O https://storage.googleapis.com/kubernetes-helm/helm-v2.17.0-linux-amd64.tar.gz
+sudo tar -zxvf helm-v2.17.0-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.15.10 --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.17.11 --service-principal $SP_ID --client-secret $SP_PASS
 )
 
 if [ $? == 0 ];

diff --git a/provision-vm/Docker/Dockerfile b/provision-vm/Docker/Dockerfile
@@ -27,20 +27,20 @@ RUN add-apt-repository "deb [arch=amd64] https://packages.microsoft.com/ubuntu/1
 RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu xenial stable"
 
 ############### Installing Helm ###############
-RUN curl -s -O https://storage.googleapis.com/kubernetes-helm/helm-v2.14.3-linux-amd64.tar.gz
-RUN tar -zxvf helm-v2.14.3-linux-amd64.tar.gz
+RUN curl -s -O https://storage.googleapis.com/kubernetes-helm/helm-v2.17.0-linux-amd64.tar.gz
+RUN tar -zxvf helm-v2.17.0-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.15.10/bin/linux/amd64/kubectl
+RUN curl -s -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.11/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.71-1~xenial
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y dotnet-sdk-2.2 jq git zip azure-cli=2.14.1-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