From b5626fc07200bd91adef19336d4a5dbbacfc90f6 Mon Sep 17 00:00:00 2001 From: Scott Hoag Date: Tue, 12 May 2020 13:41:38 -0400 Subject: [PATCH] Update provision_aks.sh (#320) * Update provision_aks.sh Update AKS cluster version from 1.13.11 to 1.15.7 * Update install_jenkins.sh Update jenkins for 1.15.7 kubectl * Update Dockerfile Update proctor container for 1.15.7 kubectl --- provision-team/jenkins/install_jenkins.sh | 2 +- provision-team/provision_aks.sh | 2 +- provision-vm/Docker/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/provision-team/jenkins/install_jenkins.sh b/provision-team/jenkins/install_jenkins.sh index 558d7c5e..efc19b53 100644 --- a/provision-team/jenkins/install_jenkins.sh +++ b/provision-team/jenkins/install_jenkins.sh @@ -489,7 +489,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get install -y jq git zip azure-cli=2.0. sudo DEBIAN_FRONTEND=noninteractive apt-get install -y docker-ce echo "############### Installing kubectl ###############" -curl -s -LO https://storage.googleapis.com/kubernetes-release/release/v1.13.11/bin/linux/amd64/kubectl +curl -s -LO https://storage.googleapis.com/kubernetes-release/release/v1.15.7/bin/linux/amd64/kubectl chmod +x ./kubectl sudo mv ./kubectl /usr/local/bin/kubectl diff --git a/provision-team/provision_aks.sh b/provision-team/provision_aks.sh index 1aed19b1..c6b51044 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.13.11 --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.15.7 --service-principal $SP_ID --client-secret $SP_PASS ) if [ $? == 0 ]; diff --git a/provision-vm/Docker/Dockerfile b/provision-vm/Docker/Dockerfile index 33bce733..1f33edb9 100644 --- a/provision-vm/Docker/Dockerfile +++ b/provision-vm/Docker/Dockerfile @@ -32,7 +32,7 @@ RUN tar -zxvf helm-v2.14.3-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.13.11/bin/linux/amd64/kubectl +RUN curl -s -LO https://storage.googleapis.com/kubernetes-release/release/v1.15.7/bin/linux/amd64/kubectl RUN chmod +x ./kubectl RUN mv ./kubectl /usr/local/bin/kubectl