From 4fec9f012b53e525d19427a50a7a40fcd286943d Mon Sep 17 00:00:00 2001
From: Joshua David Akers <akers@vt.edu>
Date: Thu, 24 Oct 2024 13:30:06 +0000
Subject: [PATCH] [PLATFORM-2866] bump kubectl version

---
 Dockerfile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d80f03a..d6c7636 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -113,17 +113,19 @@ COPY entrypoint.sh /
 COPY requirements.txt /tmp
 
 RUN apt-get clean && apt-get update && apt-get install -y curl unzip locales sshpass git jq vim sudo apt-transport-https \
-    dnsutils inetutils-traceroute inetutils-ping netcat wget\
+    dnsutils inetutils-traceroute inetutils-ping netcat gnupg wget \
     ca-certificates uuid-runtime openconnect python3 python3-pkg-resources python3-distutils python3-pip tmux zsh zsh-autosuggestions && \
-    curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.28/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg 1> /dev/null && \
-    echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.28/deb/ /" | tee /etc/apt/sources.list.d/kubernetes.list && \
+    curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.30/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg 1> /dev/null && \
+    sudo chmod 644 /etc/apt/keyrings/kubernetes-apt-keyring.gpg # allow unprivileged APT programs to read this keyring \
+    echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.30/deb/ /" | sudo tee /etc/apt/sources.list.d/kubernetes.list && \
+    sudo chmod 644 /etc/apt/sources.list.d/kubernetes.list   # helps tools such as command-not-found to work correctly \
     curl https://baltocdn.com/helm/signing.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/helm.gpg 1> /dev/null && \
     echo "deb https://baltocdn.com/helm/stable/debian/ all main" | tee /etc/apt/sources.list.d/helm-stable-debian.list && \
     curl https://proget.makedeb.org/debian-feeds/prebuilt-mpr.pub | gpg --dearmor | tee /etc/apt/trusted.gpg.d/prebuilt-mpr-archive-keyring.gpg 1> /dev/null && \
     echo "deb https://proget.makedeb.org prebuilt-mpr jammy" | tee /etc/apt/sources.list.d/prebuilt-mpr.list && \
     curl https://aquasecurity.github.io/trivy-repo/deb/public.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/trivy.gpg 1> /dev/null && \
     echo "deb https://aquasecurity.github.io/trivy-repo/deb jammy main" | tee -a /etc/apt/sources.list.d/trivy.list && \
-    apt-get clean && apt-get update && apt-get install -y kubectl=1.28.9-2.1 \
+    apt-get clean && apt-get update && apt-get install -y kubectl \
     git jq ca-certificates vim sudo uuid-runtime openconnect python3 python3-pkg-resources python3-distutils python3-pip \
     curl unzip locales sshpass silversearcher-ag helm glab trivy pinentry-tty bash-completion && \
     pip3 install -r /tmp/requirements.txt && \
-- 
GitLab