From ea2c103b4ff3ee1bf3f73f2792225e9992bd5cab Mon Sep 17 00:00:00 2001
From: Justin Walsh <49404281+Justin-Walsh@users.noreply.github.com>
Date: Fri, 8 Mar 2024 10:16:42 -0500
Subject: [PATCH 1/2] Update Kubectl repo and version

* Uses the new pkgs.k8s.io repo for kubectl
* Bumps kubectl to 1.29 (Stable)
---
 ubuntu.22.04/Dockerfile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/ubuntu.22.04/Dockerfile b/ubuntu.22.04/Dockerfile
index e84da28..4a83030 100644
--- a/ubuntu.22.04/Dockerfile
+++ b/ubuntu.22.04/Dockerfile
@@ -1,5 +1,7 @@
 FROM ubuntu:22.04
 
+ARG DEBIAN_FRONTEND noninteractive
+
 ARG Aws_Cli_Version=2.13.31
 ARG Aws_Iam_Authenticator_Version=0.5.9
 ARG Aws_Powershell_Version=4.1.412
@@ -12,7 +14,7 @@ ARG Google_Cloud_Cli_Version=445.0.0-0
 ARG Google_Cloud_Gke_Cloud_Auth_Plugin_Version=412.0.0-0
 ARG Helm_Version=v3.7.1
 ARG Java_Jdk_Version=11.0.21+9-0ubuntu1~22.04
-ARG Kubectl_Version=1.28.1-00
+ARG Kubectl_Version=1.29
 ARG Kubelogin_Version=v0.0.30
 ARG Octopus_Cli_Version=1.7.1
 ARG Octopus_Cli_Legacy_Version=9.1.7
@@ -103,11 +105,11 @@ RUN mkdir -p /etc/apt/keyrings && \
 RUN wget --quiet -O - https://deb.nodesource.com/setup_14.x | bash && \
     apt-get install -y nodejs
 
-# Get Kubectl
-# https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-using-native-package-management
-RUN wget --quiet -O - https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -  && \
-    echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | tee -a /etc/apt/sources.list.d/kubernetes.list && \
-    apt-get update && apt-get install -y kubectl=${Kubectl_Version}
+# Get kubectl
+# https://kubernetes.io/docs/tasks/tools/install-kubectl-linux/#install-using-native-package-management
+RUN curl -fsSL "https://pkgs.k8s.io/core:/stable:/v${Kubectl_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_Version}/deb/ /" | tee /etc/apt/sources.list.d/kubernetes.list && \
+    apt-get update && apt-get install -y kubectl
 
 # Get Kubelogin
 RUN wget --quiet https://github.com/Azure/kubelogin/releases/download/${Kubelogin_Version}/kubelogin-linux-amd64.zip && \

From d210f1484e6094dfd6e77f757321ab7f4387fd92 Mon Sep 17 00:00:00 2001
From: Justin Walsh <49404281+Justin-Walsh@users.noreply.github.com>
Date: Fri, 8 Mar 2024 11:05:41 -0500
Subject: [PATCH 2/2] Arg -> ENV

---
 ubuntu.22.04/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ubuntu.22.04/Dockerfile b/ubuntu.22.04/Dockerfile
index 4a83030..9520cc2 100644
--- a/ubuntu.22.04/Dockerfile
+++ b/ubuntu.22.04/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:22.04
 
-ARG DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 
 ARG Aws_Cli_Version=2.13.31
 ARG Aws_Iam_Authenticator_Version=0.5.9