Skip to content

Commit

Permalink
Drop kubectl from inttest docker image
Browse files Browse the repository at this point in the history
The kubectl was added for debugging convenience. We have `k0s kc`
nowadays so we no longer need the kubectl binary.

Remove it so we don't need change the URL every time upsteam changes it.

Signed-off-by: Natanael Copa <[email protected]>
  • Loading branch information
ncopa committed Sep 23, 2024
1 parent 3713b73 commit 000f62b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
1 change: 0 additions & 1 deletion inttest/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ bootloose_alpine_build_cmdline := \
--build-arg ALPINE_VERSION=$(alpine_patch_version) \
--build-arg ETCD_VERSION=$(etcd_version) \
--build-arg HELM_VERSION=$(helm_version) \
--build-arg KUBERNETES_VERSION=$(kubernetes_version) \
-t bootloose-alpine \
-f bootloose-alpine/Dockerfile \
bootloose-alpine
Expand Down
7 changes: 1 addition & 6 deletions inttest/bootloose-alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ FROM docker.io/library/alpine:$ALPINE_VERSION
ARG TARGETARCH
ARG CRI_DOCKERD_VERSION=0.3.15
ARG ETCD_VERSION
ARG KUBERNETES_VERSION
ARG TROUBLESHOOT_VERSION=v0.95.1
ARG HELM_VERSION

Expand All @@ -23,6 +22,7 @@ RUN apk add --no-cache \
nginx \
inotify-tools \
ipvsadm

# enable syslog and sshd
RUN rc-update add syslog boot
RUN rc-update add sshd default
Expand All @@ -37,11 +37,6 @@ RUN sed -i -e 's/^\(tty[0-9]\)/# \1/' /etc/inittab
# enable root logins
RUN sed -i -e 's/^root:!:/root::/' /etc/shadow

# Put kubectl into place to ease up debugging
RUN curl --proto '=https' --tlsv1.2 --retry 5 --retry-all-errors -Lfo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v$KUBERNETES_VERSION/bin/linux/$TARGETARCH/kubectl \
&& chmod +x /usr/local/bin/kubectl
ENV KUBECONFIG=/var/lib/k0s/pki/admin.conf

# Install troublbeshoot support bundle
RUN curl --proto '=https' --tlsv1.2 -L https://github.com/replicatedhq/troubleshoot/releases/download/$TROUBLESHOOT_VERSION/support-bundle_linux_$TARGETARCH.tar.gz \
| tar xzO support-bundle >/usr/local/bin/kubectl-supportbundle \
Expand Down

0 comments on commit 000f62b

Please sign in to comment.