From deabb5ceccb60d95701076e02ee93bdbc6c32cc0 Mon Sep 17 00:00:00 2001 From: Matt Hilton <730704+mjhilton@users.noreply.github.com> Date: Thu, 1 Dec 2022 10:01:56 +1100 Subject: [PATCH 1/2] Prompt future devs on `gke-cloud-auth-plugin` Add a comment to the Ubuntu Dockerfile to ensure that future maintainers will add the `gke-cloud-auth-plugin` if needed --- ubuntu.18.04/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ubuntu.18.04/Dockerfile b/ubuntu.18.04/Dockerfile index 5423931..1749bfa 100644 --- a/ubuntu.18.04/Dockerfile +++ b/ubuntu.18.04/Dockerfile @@ -11,6 +11,8 @@ ARG Eks_Cli_Version=0.25.0 ARG Google_Cloud_Cli_Version=339.0.0-0 ARG Helm_Version=v3.7.1 ARG Java_Jdk_Version=11.0.17+8-1ubuntu2~18.04 +# If bumping Kubectl to 1.26 or above, please also add the gke-cloud-auth-plugin tool to this image to facilitate GKE login +# See https://github.com/OctopusDeploy/Issues/issues/7621 for more info ARG Kubectl_Version=1.18.8-00 ARG Octopus_Cli_Version=7.4.1 ARG Octopus_Client_Version=8.8.3 From f8e5e2d43742dc688f020ed32dfb42bc17f037e8 Mon Sep 17 00:00:00 2001 From: Matt Hilton <730704+mjhilton@users.noreply.github.com> Date: Thu, 1 Dec 2022 10:03:01 +1100 Subject: [PATCH 2/2] Prompt future devs on `gke-cloud-auth-plugin` Add a comment to the Ubuntu Dockerfile to ensure that future maintainers will add the `gke-cloud-auth-plugin` if needed --- windows.ltsc2019/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/windows.ltsc2019/Dockerfile b/windows.ltsc2019/Dockerfile index 2e11da1..c475453 100644 --- a/windows.ltsc2019/Dockerfile +++ b/windows.ltsc2019/Dockerfile @@ -12,6 +12,8 @@ ARG Eks_Cli_Version=0.25.0 ARG Google_Cloud_Cli_Version=339.0.0 ARG Helm_Version=3.7.1 ARG Java_Jdk_Version=14.0.2 +# If bumping Kubectl to 1.26 or above, please also add the gke-cloud-auth-plugin tool to this image to facilitate GKE login +# See https://github.com/OctopusDeploy/Issues/issues/7621 for more info ARG Kubectl_Version=1.18.8 ARG Node_Version=14.17.2 ARG Octopus_Cli_Version=7.4.1