Skip to content

Commit

Permalink
chore: update various container deps. (#8815)
Browse files Browse the repository at this point in the history
kubectl 1.27.1 -> 1.27.2
kpt 1.0.0-beta.32 -> 1.0.0-beta.33
gcloud 430.0.0 -> 432.0.0
golang 1.19.8 -> 1.19.9

The golang upgrade is to address a specific CVE, the others are just along for the ride.
  • Loading branch information
plumpy authored May 24, 2023
1 parent db06b74 commit c7e1131
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions deploy/skaffold/Dockerfile.deps
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM alpine:3.10 as download-kubectl
ARG ARCH
# Track default version installed by Google Cloud SDK: 424.0.0 moved to 1.24.12
# https://cloud.google.com/sdk/docs/release-notes
ENV KUBECTL_VERSION v1.27.1
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 .
Expand Down Expand Up @@ -48,7 +48,7 @@ RUN tar -xvf kustomize.tar.gz
# Download kpt
FROM alpine:3.10 as download-kpt
ARG ARCH
ENV KPT_VERSION 1.0.0-beta.32
ENV KPT_VERSION 1.0.0-beta.33
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
Expand Down Expand Up @@ -93,7 +93,7 @@ RUN chmod +x k3d
# Download gcloud
FROM alpine:3.10 as download-gcloud
ARG ARCH
ENV GCLOUD_VERSION 430.0.0
ENV GCLOUD_VERSION 432.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 Down Expand Up @@ -163,5 +163,5 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge
jq \
apt-transport-https && \
rm -rf /var/lib/apt/lists/*
COPY --from=golang:1.19.6 /usr/local/go /usr/local/go
COPY --from=golang:1.19.9 /usr/local/go /usr/local/go
ENV PATH /usr/local/go/bin:/root/go/bin:$PATH
8 changes: 4 additions & 4 deletions deploy/skaffold/Dockerfile.deps.lts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM alpine:3.10 as download-kubectl
ARG ARCH
# Track default version installed by Google Cloud SDK: 424.0.0 moved to 1.24.12
# https://cloud.google.com/sdk/docs/release-notes
ENV KUBECTL_VERSION v1.27.1
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 .
Expand Down Expand Up @@ -48,7 +48,7 @@ RUN tar -xvf kustomize.tar.gz
# Download kpt
FROM alpine:3.10 as download-kpt
ARG ARCH
ENV KPT_VERSION 1.0.0-beta.32
ENV KPT_VERSION 1.0.0-beta.33
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
Expand All @@ -57,7 +57,7 @@ RUN chmod +x kpt
# Download gcloud
FROM alpine:3.10 as download-gcloud
ARG ARCH
ENV GCLOUD_VERSION 430.0.0
ENV GCLOUD_VERSION 432.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 Down Expand Up @@ -105,5 +105,5 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge
jq \
apt-transport-https && \
rm -rf /var/lib/apt/lists/*
COPY --from=golang:1.19.6 /usr/local/go /usr/local/go
COPY --from=golang:1.19.9 /usr/local/go /usr/local/go
ENV PATH /usr/local/go/bin:/root/go/bin:$PATH
8 changes: 4 additions & 4 deletions deploy/skaffold/Dockerfile.deps.slim
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM alpine:3.10 as download-kubectl
ARG ARCH
# Track default version installed by Google Cloud SDK: 424.0.0 moved to 1.24.12
# https://cloud.google.com/sdk/docs/release-notes
ENV KUBECTL_VERSION v1.27.1
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 .
Expand Down Expand Up @@ -48,7 +48,7 @@ RUN tar -xvf kustomize.tar.gz
# Download kpt
FROM alpine:3.10 as download-kpt
ARG ARCH
ENV KPT_VERSION 1.0.0-beta.32
ENV KPT_VERSION 1.0.0-beta.33
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
Expand All @@ -57,7 +57,7 @@ RUN chmod +x kpt
# Download gcloud
FROM alpine:3.10 as download-gcloud
ARG ARCH
ENV GCLOUD_VERSION 430.0.0
ENV GCLOUD_VERSION 432.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 Down Expand Up @@ -104,5 +104,5 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge
jq \
apt-transport-https && \
rm -rf /var/lib/apt/lists/*
COPY --from=golang:1.19.6 /usr/local/go /usr/local/go
COPY --from=golang:1.19.9 /usr/local/go /usr/local/go
ENV PATH /usr/local/go/bin:/root/go/bin:$PATH
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/gcloud.amd64.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a10844ec4e5af0e9f8c814ab765018bd40006c43e23b9f98cb25388848facea6 gcloud.tar.gz
b24ba27d57463e08db859b7941cf4d7c33cb3af5865095639e3e0b2055cbec66 gcloud.tar.gz
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/kpt.amd64.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
227a6a4fdb391c53b74516a25964d61f63e5aa4e1fa19920fcc76603dc752871 kpt
13e895580f891d9f1f7147f6d70b2ff990299a113b722b66de615eeda48109f8 kpt
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/kubectl.amd64.sha512
Original file line number Diff line number Diff line change
@@ -1 +1 @@
45c837500fd821553a76dfec626cbbe44ac9c5c2c82984e8cd1073615ed4707e69b0f6bd7adf001e0ddbcc89ccc7bca38162e7ee778473d59a09c91f3d99f7c2 kubectl
857e67001e74840518413593d90c6e64ad3f00d55fa44ad9a8e2ed6135392c908caff7ec19af18cbe10784b8f83afe687a0bc3bacbc9eee984cdeb9c0749cb83 kubectl

0 comments on commit c7e1131

Please sign in to comment.