From 3f58a4cf402d90394e2ecc444e345823df40148f Mon Sep 17 00:00:00 2001 From: Brent Date: Wed, 11 Nov 2020 13:24:09 -0800 Subject: [PATCH] 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 --- provision-team/jenkins/install_jenkins.sh | 10 +++++----- provision-team/provision_aks.sh | 2 +- provision-vm/Docker/Dockerfile | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/provision-team/jenkins/install_jenkins.sh b/provision-team/jenkins/install_jenkins.sh index eb71b440..da8eadca 100644 --- 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 index de9f93f1..791dc566 100755 --- 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 index 0e96e78e..af0eff64 100644 --- a/provision-vm/Docker/Dockerfile +++ b/provision-vm/Docker/Dockerfile @@ -27,12 +27,12 @@ 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 @@ -40,7 +40,7 @@ RUN mv ./kubectl /usr/local/bin/kubectl 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