Skip to content

Commit

Permalink
chore: upgrade all bundled tools in the Skaffold container (#9646)
Browse files Browse the repository at this point in the history
  • Loading branch information
plumpy authored Jan 13, 2025
1 parent 71bbee7 commit fb14be6
Show file tree
Hide file tree
Showing 12 changed files with 42 additions and 43 deletions.
65 changes: 32 additions & 33 deletions deploy/skaffold/Dockerfile.deps
Original file line number Diff line number Diff line change
Expand Up @@ -15,84 +15,83 @@
ARG ARCH=amd64

# Download kubectl
FROM alpine:3.10 as download-kubectl
FROM alpine:3.21.2 as download-kubectl
ARG ARCH
# https://cloud.google.com/sdk/docs/release-notes
ENV KUBECTL_VERSION v1.27.2
ENV KUBECTL_URL https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/${ARCH}/kubectl
# SHAs at gs://kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/${ARCH}/
COPY deploy/skaffold/digests/kubectl.${ARCH}.sha512 .
RUN wget -O kubectl "${KUBECTL_URL}" && sha512sum -c kubectl.${ARCH}.sha512
# https://dl.k8s.io/release/stable.txt
ENV KUBECTL_VERSION v1.32.0
ENV KUBECTL_URL https://storage.googleapis.com/skaffold/deps/kubectl/${KUBECTL_VERSION}/kubectl
COPY deploy/skaffold/digests/kubectl.${ARCH}.sha256 .
RUN wget -O kubectl "${KUBECTL_URL}" && sha256sum -c kubectl.${ARCH}.sha256
RUN chmod +x kubectl

# Download helm (see https://github.com/helm/helm/releases/latest)
FROM alpine:3.10 as download-helm
FROM alpine:3.21.2 as download-helm
ARG ARCH
RUN echo arch=$ARCH
ENV HELM_VERSION v3.12.0
ENV HELM_VERSION v3.16.4
ENV HELM_URL https://storage.googleapis.com/skaffold/deps/helm/helm-${HELM_VERSION}-linux-${ARCH}.tar.gz
COPY deploy/skaffold/digests/helm.${ARCH}.sha256 .
RUN wget -O helm.tar.gz "${HELM_URL}" && sha256sum -c helm.${ARCH}.sha256
RUN tar -xvf helm.tar.gz --strip-components 1

# Download kustomize
FROM alpine:3.10 as download-kustomize
# Download kustomize (see https://github.com/kubernetes-sigs/kustomize/releases/latest)
FROM alpine:3.21.2 as download-kustomize
ARG ARCH
ENV KUSTOMIZE_VERSION 5.0.3
ENV KUSTOMIZE_VERSION 5.5.0
ENV KUSTOMIZE_URL https://storage.googleapis.com/skaffold/deps/kustomize/v${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_${ARCH}.tar.gz
COPY deploy/skaffold/digests/kustomize.${ARCH}.sha256 .
RUN wget -O kustomize.tar.gz "${KUSTOMIZE_URL}" && sha256sum -c kustomize.${ARCH}.sha256
RUN tar -xvf kustomize.tar.gz

# Download kpt
FROM alpine:3.10 as download-kpt
# Download kpt (see https://github.com/kptdev/kpt/releases/latest)
FROM alpine:3.21.2 as download-kpt
ARG ARCH
ENV KPT_VERSION 1.0.0-beta.33
ENV KPT_VERSION 1.0.0-beta.55
ENV KPT_URL https://storage.googleapis.com/skaffold/deps/kpt/v${KPT_VERSION}/kpt_linux_amd64
COPY deploy/skaffold/digests/kpt.${ARCH}.sha256 .
RUN wget -O kpt "${KPT_URL}" && sha256sum -c kpt.${ARCH}.sha256
RUN chmod +x kpt

# Download kompose
FROM alpine:3.10 as download-kompose
# Download kompose (see https://github.com/kubernetes/kompose/releases/latest)
FROM alpine:3.21.2 as download-kompose
ARG ARCH
ENV KOMPOSE_VERSION v1.26.0
ENV KOMPOSE_VERSION v1.35.0
ENV KOMPOSE_URL https://storage.googleapis.com/skaffold/deps/kompose/${KOMPOSE_VERSION}/kompose-linux-amd64
COPY deploy/skaffold/digests/kompose.${ARCH}.sha256 .
RUN wget -O kompose "${KOMPOSE_URL}" && sha256sum -c kompose.${ARCH}.sha256
RUN chmod +x kompose

# Download container-structure-test (https://github.com/GoogleContainerTools/container-structure-test/releases/latest)
FROM alpine:3.10 as download-container-structure-test
FROM alpine:3.21.2 as download-container-structure-test
ARG ARCH
ENV CONTAINER_STRUCTURE_TEST_VERSION v1.10.0
ENV CONTAINER_STRUCTURE_TEST_URL https://storage.googleapis.com/container-structure-test/${CONTAINER_STRUCTURE_TEST_VERSION}/container-structure-test-linux-${ARCH}
ENV CONTAINER_STRUCTURE_TEST_VERSION v1.19.3
ENV CONTAINER_STRUCTURE_TEST_URL https://storage.googleapis.com/skaffold/deps/container-structure-test/${CONTAINER_STRUCTURE_TEST_VERSION}/container-structure-test-linux-${ARCH}
COPY deploy/skaffold/digests/container-structure-test.${ARCH}.sha512 .
RUN wget -O container-structure-test "${CONTAINER_STRUCTURE_TEST_URL}" && sha512sum -c container-structure-test.${ARCH}.sha512
RUN chmod +x container-structure-test

# Download kind
FROM alpine:3.10 as download-kind
# Download kind (see https://github.com/kubernetes-sigs/kind/releases/latest)
FROM alpine:3.21.2 as download-kind
ARG ARCH
ENV KIND_VERSION v0.11.1
ENV KIND_VERSION v0.26.0
ENV KIND_URL https://storage.googleapis.com/skaffold/deps/kind/${KIND_VERSION}/kind-linux-${ARCH}
COPY deploy/skaffold/digests/kind.${ARCH}.sha512 .
RUN wget -O kind "${KIND_URL}" && sha512sum -c kind.${ARCH}.sha512
RUN chmod +x kind

# Download k3d
FROM alpine:3.10 as download-k3d
# Download k3d (see https://github.com/k3d-io/k3d/releases/latest)
FROM alpine:3.21.2 as download-k3d
ARG ARCH
ENV K3D_VERSION v5.0.3
ENV K3D_VERSION v5.7.5
ENV K3D_URL https://storage.googleapis.com/skaffold/deps/k3d/${K3D_VERSION}/k3d-linux-amd64
COPY deploy/skaffold/digests/k3d.${ARCH}.sha256 .
RUN wget -O k3d "${K3D_URL}" && sha256sum -c k3d.${ARCH}.sha256
RUN chmod +x k3d

# Download gcloud
FROM alpine:3.10 as download-gcloud
# Download gcloud (see https://cloud.google.com/sdk/docs/release-notes)
FROM alpine:3.21.2 as download-gcloud
ARG ARCH
ENV GCLOUD_VERSION 496.0.0
ENV GCLOUD_VERSION 505.0.0
ENV GCLOUD_URL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GCLOUD_VERSION}-linux-GCLOUDARCH.tar.gz
# SHAs listed at https://cloud.google.com/sdk/docs/downloads-versioned-archives
COPY deploy/skaffold/digests/gcloud.${ARCH}.sha256 .
Expand All @@ -102,10 +101,10 @@ RUN \
sha256sum -c gcloud.${ARCH}.sha256
RUN tar -zxf gcloud.tar.gz

# Download bazel
FROM alpine:3.10 as download-bazel
# Download bazel (see https://github.com/bazelbuild/bazel/releases/latest)
FROM alpine:3.21.2 as download-bazel
ARG ARCH
ENV BAZEL_VERSION 4.2.1
ENV BAZEL_VERSION 8.0.0
ENV BAZEL_URL https://storage.googleapis.com/skaffold/deps/bazel/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-linux-BAZELARCH
COPY deploy/skaffold/digests/bazel.${ARCH}.sha256 .
RUN \
Expand Down
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/bazel.amd64.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1a4f3a3ce292307bceeb44f459883859c793436d564b95319aacb8af1f20557c bazel
18417fdee645a8dc08bc3f27e33f71a5681f9f14661b33ac48536a31dc8d00f1 bazel
Original file line number Diff line number Diff line change
@@ -1 +1 @@
392ce1d4462d55b5c421f83b6be1a22e7e50380f54633d90a963f37155550ebaabf27797877003322938136163fedaec461f44ae7acce1b23b7fd869d35f8d28 container-structure-test
79c8b367e024d18b8279e504aa197f6a3074ccb07b5feea6f7e73e598acd8969481f7a7db43f50bcf4565e2fe8c71ee990dd554e1644eed9927cc83973495381 container-structure-test
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/gcloud.amd64.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9355cdd311c622f13e2f2a3eb06ffd1b74a1f50a9d1af9eed786cbe0e9a5b736 gcloud.tar.gz
3be8585aed4cdada86fd38ee872c6a07d9ab898ae5ce65296b5445ae181f78e9 gcloud.tar.gz
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/helm.amd64.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
da36e117d6dbc57c8ec5bab2283222fbd108db86c83389eebe045ad1ef3e2c3b helm.tar.gz
fc307327959aa38ed8f9f7e66d45492bb022a66c3e5da6063958254b9767d179 helm.tar.gz
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/k3d.amd64.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
018421fdff567df5df3840e75501a40199501ce6bf25e1f2dd259f74e13519f3 k3d
5d3f22817d9e163ab6ed43572189dd49fe724d7a6948075b570067747eca8d3f k3d
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/kind.amd64.sha512
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ce57a5438dcbec1269c583470695d11e5e759ad22a88a1214f0564e6513b912e3ffd380f6be61afc759a66b611bf1d966043cef16059ac096d96d81129281204 kind
15ba3777f5c4f17b3cc90eee62549cb42c6106a40fe115c8524d72f3a8601362d50890c52fc2561d0fe77e15865a274ca67600903ef2dde00780aad1dccffc1e kind
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/kompose.amd64.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8c6c47073a95a52487a760f69a79669e2786c7aa3ba6e3007095efd524593253 kompose
d7de6c93ef083b668cdcf11bb7ebf739f853952ad229c4afcbbda5af7a480672 kompose
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/kpt.amd64.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
13e895580f891d9f1f7147f6d70b2ff990299a113b722b66de615eeda48109f8 kpt
2ad75fdc7f54ff451590c0793d4616115a93ee1eb1a1672715993b2e45833404 kpt
1 change: 1 addition & 0 deletions deploy/skaffold/digests/kubectl.amd64.sha256
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
646d58f6d98ee670a71d9cdffbf6625aeea2849d567f214bc43a35f8ccb7bf70 kubectl
1 change: 0 additions & 1 deletion deploy/skaffold/digests/kubectl.amd64.sha512

This file was deleted.

2 changes: 1 addition & 1 deletion deploy/skaffold/digests/kustomize.amd64.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c627b1575c3fecbc7ad1c181c23a7adcacf19732dab627eb57e89a7bc4c1e929 kustomize.tar.gz
6703a3a70a0c47cf0b37694030b54f1175a9dfeb17b3818b623ed58b9dbc2a77 kustomize.tar.gz

0 comments on commit fb14be6

Please sign in to comment.