github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

revert PR https://github.com/kubernetes/kubernetes/pull/119592

Browse Source
This commit is contained in:
Rayan Das 2023-08-28 23:57:17 +05:30
parent 9c25ce6f3e
commit 651eb2fa58
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.yaml
View File

@ -146,8 +146,6 @@ dependencies:
- name: "registry.k8s.io/debian-base: dependents" - name: "registry.k8s.io/debian-base: dependents"
version: bookworm-v1.0.0 version: bookworm-v1.0.0
refPaths: 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 - 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-]+)*))?) 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 - path: cluster/images/etcd/Makefile

15
build/server-image/kubectl/Dockerfile
View File

@ -14,21 +14,10 @@
# Dockerfile used for the kubectl image. # Dockerfile used for the kubectl image.
ARG BASEIMAGE
ARG BINARY ARG BINARY
FROM registry.k8s.io/build-image/debian-base:bookworm-v1.0.0 FROM "${BASEIMAGE}"
COPY ${BINARY} /bin/ 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"] ENTRYPOINT ["/bin/kubectl"]