Merge pull request #120219 from rayandas/rayan-revert-kubectl-changes

Revert Dockerfile changes for kubectl image.

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

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"]