diff --git a/inttest/Makefile b/inttest/Makefile index 64be48fd9961..62fadd3e35e0 100644 --- a/inttest/Makefile +++ b/inttest/Makefile @@ -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 diff --git a/inttest/bootloose-alpine/Dockerfile b/inttest/bootloose-alpine/Dockerfile index fd039991f559..c83744c1b941 100644 --- a/inttest/bootloose-alpine/Dockerfile +++ b/inttest/bootloose-alpine/Dockerfile @@ -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 @@ -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 @@ -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 \