feat: revert to kubectl 1.26 and gcloud sdk 420 for gcp auth slowness

TaitoUnited · Dec 8, 2023 · 2c70aa6 · 2c70aa6
1 parent c135304
commit 2c70aa6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/tools/install-gcloud.sh b/tools/install-gcloud.sh
@@ -7,6 +7,7 @@ set -eux; \
       tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
     curl https://packages.cloud.google.com/apt/doc/apt-key.gpg |
       apt-key --keyring /usr/share/keyrings/cloud.google.gpg  add - && \
-    apt-get update -y && apt-get install google-cloud-sdk -y && \
-    apt-get update -y && apt-get install google-cloud-cli-gke-gcloud-auth-plugin -y
-
+    export GCLOUD_SDK_VERSION=${GCLOUD_SDK_VERSION:-420.0.0-0} && \
+    export GCLOUD_AUTH_VERSION=${GCLOUD_AUTH_VERSION:-420.0.0-0} && \
+    apt-get update -y && apt-get install google-cloud-sdk=${GCLOUD_SDK_VERSION} -y && \
+    apt-get update -y && apt-get install google-cloud-cli-gke-gcloud-auth-plugin=${GCLOUD_AUTH_VERSION} -y
diff --git a/tools/install-kubectl.sh b/tools/install-kubectl.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 
 set -eux; \
-    export KUBECTL_BASE_VERSION=${KUBECTL_BASE_VERSION:-1.27} && \
+    export KUBECTL_BASE_VERSION=${KUBECTL_BASE_VERSION:-1.26} && \
     curl -fsSL https://pkgs.k8s.io/core:/stable:/v${KUBECTL_BASE_VERSION}/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg && \
     echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v${KUBECTL_BASE_VERSION}/deb/ /" | tee /etc/apt/sources.list.d/kubernetes.list && \
     apt-get -qqy update && \