From 651eb2fa58fbb0614860d2d71a15bd2e645f5735 Mon Sep 17 00:00:00 2001
From: Rayan Das <rayandas91@gmail.com>
Date: Mon, 28 Aug 2023 23:57:17 +0530
Subject: [PATCH] revert PR
 https://github.com/kubernetes/kubernetes/pull/119592

---
 build/dependencies.yaml               |  2 --
 build/server-image/kubectl/Dockerfile | 15 ++-------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/build/dependencies.yaml b/build/dependencies.yaml
index 5d2eefe9257..4f79066b5fd 100644
--- a/build/dependencies.yaml
+++ b/build/dependencies.yaml
@@ -146,8 +146,6 @@ dependencies:
   - name: "registry.k8s.io/debian-base: dependents"
     version: bookworm-v1.0.0
     refPaths:
-    - path: build/server-image/kubectl/Dockerfile
-      match: FROM\s+registry\.k8s\.io\/build-image\/debian-base:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
     - path: cluster/images/etcd/Makefile
       match: BASEIMAGE\?\=registry\.k8s\.io\/build-image\/debian-base:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
     - path: cluster/images/etcd/Makefile
diff --git a/build/server-image/kubectl/Dockerfile b/build/server-image/kubectl/Dockerfile
index 7cbc9e9136a..0c93ca6a4e1 100644
--- a/build/server-image/kubectl/Dockerfile
+++ b/build/server-image/kubectl/Dockerfile
@@ -14,21 +14,10 @@
 
 # Dockerfile used for the kubectl image.
 
+ARG BASEIMAGE
 ARG BINARY
 
 
-FROM registry.k8s.io/build-image/debian-base:bookworm-v1.0.0
+FROM "${BASEIMAGE}"
 COPY ${BINARY} /bin/
-
-# Install additional utilities
-RUN apt update \
-    && apt install -y bash \
-                       grep \
-                       sed \
-                       gawk \
-                       coreutils \
-                       jq \
-                       diffutils \
-    && rm -rf /var/lib/apt/lists/*
-
 ENTRYPOINT ["/bin/kubectl"]