Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: one last PR of dependency upgrades before the release is cut #9680

Merged
merged 2 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions deploy/skaffold/Dockerfile.deps
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ARG ARCH=amd64
FROM alpine:3.21.2 as download-kubectl
ARG ARCH
# https://dl.k8s.io/release/stable.txt
ENV KUBECTL_VERSION v1.32.0
ENV KUBECTL_VERSION v1.32.1
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
Expand All @@ -28,7 +28,7 @@ RUN chmod +x kubectl
FROM alpine:3.21.2 as download-helm
ARG ARCH
RUN echo arch=$ARCH
ENV HELM_VERSION v3.16.4
ENV HELM_VERSION v3.17.0
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
Expand All @@ -37,7 +37,7 @@ RUN tar -xvf helm.tar.gz --strip-components 1
# 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.5.0
ENV KUSTOMIZE_VERSION 5.6.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
Expand Down Expand Up @@ -82,7 +82,7 @@ RUN chmod +x kind
# 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.7.5
ENV K3D_VERSION v5.8.1
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
Expand All @@ -91,7 +91,7 @@ RUN chmod +x k3d
# Download gcloud (see https://cloud.google.com/sdk/docs/release-notes)
FROM alpine:3.21.2 as download-gcloud
ARG ARCH
ENV GCLOUD_VERSION 505.0.0
ENV GCLOUD_VERSION 507.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 @@ -104,7 +104,7 @@ RUN tar -zxf gcloud.tar.gz
# Download bazel (see https://github.com/bazelbuild/bazel/releases/latest)
FROM alpine:3.21.2 as download-bazel
ARG ARCH
ENV BAZEL_VERSION 8.0.0
ENV BAZEL_VERSION 8.0.1
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 All @@ -113,16 +113,16 @@ RUN \
sha256sum -c bazel.${ARCH}.sha256
RUN chmod +x bazel

FROM ubuntu:20.04 as runtime_deps
FROM ubuntu:24.04 as runtime_deps

RUN apt-get update && \
apt-get install --no-install-recommends --no-install-suggests -y \
git python unzip && \
git python3 unzip && \
rm -rf /var/lib/apt/lists/*

COPY --from=docker:23.0.1 /usr/local/bin/docker /usr/local/bin/
COPY --from=docker:27.5.1 /usr/local/bin/docker /usr/local/bin/
# From Docker Engine version 23.0.0, Buildx is distributed in a separate package: docker-buildx-plugin. In earlier versions, Buildx was included in the docker-ce-cli package
COPY --from=docker/buildx-bin:0.10.4 /buildx /usr/libexec/docker/cli-plugins/docker-buildx
COPY --from=docker/buildx-bin:0.20.1 /buildx /usr/libexec/docker/cli-plugins/docker-buildx
COPY --from=download-kubectl kubectl /usr/local/bin/
COPY --from=download-helm helm /usr/local/bin/
COPY --from=download-kustomize kustomize /usr/local/bin/
Expand Down Expand Up @@ -155,12 +155,12 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \
curl \
build-essential \
python-setuptools \
python3-setuptools \
lsb-release \
openjdk-17-jdk \
openjdk-21-jdk \
software-properties-common \
jq \
apt-transport-https && \
rm -rf /var/lib/apt/lists/*
COPY --from=golang:1.23.4 /usr/local/go /usr/local/go
COPY --from=golang:1.23.5 /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/bazel.amd64.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18417fdee645a8dc08bc3f27e33f71a5681f9f14661b33ac48536a31dc8d00f1 bazel
40f243b118f46d1c88842315e78ec5f9f6390980d67a90f7b64098613e60d65b bazel
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/gcloud.amd64.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3be8585aed4cdada86fd38ee872c6a07d9ab898ae5ce65296b5445ae181f78e9 gcloud.tar.gz
497203706b4471edaacc5548a545d24bb087cdb1557ce00b9dfbdf168f633dd4 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 @@
fc307327959aa38ed8f9f7e66d45492bb022a66c3e5da6063958254b9767d179 helm.tar.gz
fb5d12662fde6eeff36ac4ccacbf3abed96b0ee2de07afdde4edb14e613aee24 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 @@
5d3f22817d9e163ab6ed43572189dd49fe724d7a6948075b570067747eca8d3f k3d
b900911e5943fecbc341f21a628d9c425d19b629bad8df13d60ba28d1f8e2e6e k3d
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/kubectl.amd64.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
646d58f6d98ee670a71d9cdffbf6625aeea2849d567f214bc43a35f8ccb7bf70 kubectl
e16c80f1a9f94db31063477eb9e61a2e24c1a4eee09ba776b029048f5369db0c kubectl
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/kustomize.amd64.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6703a3a70a0c47cf0b37694030b54f1175a9dfeb17b3818b623ed58b9dbc2a77 kustomize.tar.gz
54e4031ddc4e7fc59e408da29e7c646e8e57b8088c51b84b3df0864f47b5148f kustomize.tar.gz
90 changes: 45 additions & 45 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16
require (
4d63.com/tz v1.2.0
cloud.google.com/go/cloudbuild v1.20.0
cloud.google.com/go/monitoring v1.22.1
cloud.google.com/go/monitoring v1.23.0
cloud.google.com/go/profiler v0.4.2
cloud.google.com/go/storage v1.50.0
dario.cat/mergo v1.0.1
Expand All @@ -30,34 +30,34 @@ require (
github.com/cenkalti/backoff/v4 v4.3.0
github.com/containerd/containerd v1.7.25
github.com/distribution/reference v0.6.0
github.com/docker/cli v27.5.0+incompatible
github.com/docker/docker v27.5.0+incompatible
github.com/docker/cli v27.5.1+incompatible
github.com/docker/docker v27.5.1+incompatible
github.com/docker/go-connections v0.5.0
github.com/dustin/go-humanize v1.0.1
github.com/evanphx/json-patch v5.9.0+incompatible
github.com/fatih/semgroup v1.3.0
github.com/go-git/go-git/v5 v5.13.1
github.com/go-git/go-git/v5 v5.13.2
github.com/go-jose/go-jose/v4 v4.0.4
github.com/golang/glog v1.2.4
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8
github.com/golang/protobuf v1.5.4
github.com/google/go-cmp v0.6.0
github.com/google/go-containerregistry v0.20.2
github.com/google/go-containerregistry v0.20.3
github.com/google/go-github v17.0.0+incompatible
github.com/google/ko v0.17.1
github.com/google/uuid v1.6.0
github.com/googleapis/gax-go/v2 v2.14.1
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.0
github.com/hashicorp/hcl v1.0.1-vault-7
github.com/heroku/color v0.0.6
github.com/joho/godotenv v1.5.1
github.com/karrick/godirwalk v1.16.2
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
github.com/krishicks/yaml-patch v0.0.10
github.com/letsencrypt/boulder v0.0.0-20250114215406-2e1f733c269b
github.com/letsencrypt/boulder v0.0.0-20250122215048-ca73500467e5
github.com/mattn/go-colorable v0.1.14
github.com/mitchellh/go-homedir v1.1.0
github.com/moby/buildkit v0.18.2
github.com/moby/buildkit v0.19.0
github.com/moby/patternmatcher v0.6.0
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.0
Expand All @@ -80,7 +80,7 @@ require (
go.lsp.dev/uri v0.3.0
go.opentelemetry.io/otel v1.34.0
go.opentelemetry.io/otel/exporters/jaeger v1.17.0
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.33.0
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.34.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.34.0
go.opentelemetry.io/otel/metric v1.34.0
go.opentelemetry.io/otel/sdk v1.34.0
Expand All @@ -92,17 +92,17 @@ require (
golang.org/x/sys v0.29.0
golang.org/x/term v0.28.0
golang.org/x/tools v0.29.0
google.golang.org/api v0.217.0
google.golang.org/genproto v0.0.0-20250106144421-5f5ef82da422
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f
google.golang.org/api v0.218.0
google.golang.org/genproto v0.0.0-20250122153221-138b5a5a4fd4
google.golang.org/genproto/googleapis/api v0.0.0-20250122153221-138b5a5a4fd4
google.golang.org/grpc v1.69.4
google.golang.org/protobuf v1.36.3
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.32.0
k8s.io/api v0.32.1
k8s.io/apimachinery v0.32.1
k8s.io/client-go v0.32.0
k8s.io/kubectl v0.32.0
k8s.io/client-go v0.32.1
k8s.io/kubectl v0.32.1
k8s.io/utils v0.0.0-20241210054802-24370beab758
sigs.k8s.io/cli-utils v0.37.2
sigs.k8s.io/kustomize/api v0.19.0
Expand Down Expand Up @@ -139,37 +139,37 @@ require (
github.com/Masterminds/semver v1.5.0 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/Microsoft/hcsshim v0.12.9 // indirect
github.com/ProtonMail/go-crypto v1.1.4 // indirect
github.com/ProtonMail/go-crypto v1.1.5 // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/ahmetalpbalkan/dlog v0.0.0-20170105205344-4fb5f8204f26 // indirect
github.com/alessio/shellescape v1.5.1 // indirect
github.com/apex/log v1.9.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/aws/aws-sdk-go-v2 v1.32.8 // indirect
github.com/aws/aws-sdk-go-v2/config v1.28.11 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.52 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27 // indirect
github.com/aws/aws-sdk-go-v2 v1.33.0 // indirect
github.com/aws/aws-sdk-go-v2/config v1.29.1 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.54 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.24 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.28 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.28 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
github.com/aws/aws-sdk-go-v2/service/ecr v1.38.4 // indirect
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.29.2 // indirect
github.com/aws/aws-sdk-go-v2/service/ecr v1.38.6 // indirect
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.29.4 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.33.7 // indirect
github.com/aws/smithy-go v1.22.1 // indirect
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20241227172826-c97b94eac159 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.9 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.24.11 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.10 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.33.9 // indirect
github.com/aws/smithy-go v1.22.2 // indirect
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20250122231607-9c4d930e8fce // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589 // indirect
github.com/cloudflare/circl v1.5.0 // indirect
github.com/cncf/xds/go v0.0.0-20241223141626-cff3c89139a3 // indirect
github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
github.com/containerd/errdefs v1.0.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/containerd/platforms v1.0.0-rc.1 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
github.com/containerd/ttrpc v1.2.7 // indirect
github.com/containerd/typeurl/v2 v2.2.3 // indirect
Expand All @@ -185,7 +185,7 @@ require (
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/envoyproxy/go-control-plane/envoy v1.32.3 // indirect
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
Expand Down Expand Up @@ -214,7 +214,7 @@ require (
github.com/google/gnostic-models v0.6.9 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
github.com/google/pprof v0.0.0-20250121033306-997b0b79cac0 // indirect
github.com/google/s2a-go v0.1.9 // indirect
github.com/google/safetext v0.0.0-20240722112252-5a72de7e7962 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
Expand Down Expand Up @@ -243,7 +243,6 @@ require (
github.com/mitchellh/ioprogress v0.0.0-20180201004757-6a23b12fa88e // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/mmcloughlin/avo v0.6.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/spdystream v0.5.0 // indirect
github.com/moby/sys/sequential v0.6.0 // indirect
Expand All @@ -263,12 +262,12 @@ require (
github.com/pborman/uuid v1.2.1 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
github.com/pjbgf/sha1cd v0.3.1 // indirect
github.com/pjbgf/sha1cd v0.3.2 // indirect
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.20.5 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.61.0 // indirect
github.com/prometheus/common v0.62.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rivo/tview v0.0.0-20241227133733-17b7edb88c57 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
Expand All @@ -281,7 +280,7 @@ require (
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/sigstore/cosign/v2 v2.4.1 // indirect
github.com/sigstore/protobuf-specs v0.3.3 // indirect
github.com/sigstore/rekor v1.3.7 // indirect
github.com/sigstore/rekor v1.3.8 // indirect
github.com/sigstore/sigstore v1.8.12 // indirect
github.com/skeema/knownhosts v1.3.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
Expand All @@ -290,7 +289,7 @@ require (
github.com/subosito/gotenv v1.6.0 // indirect
github.com/theupdateframework/go-tuf v0.7.0 // indirect
github.com/tonistiigi/go-csvvalue v0.0.0-20240814133006-030d3b2625d0 // indirect
github.com/vbatts/tar-split v0.11.6 // indirect
github.com/vbatts/tar-split v0.11.7 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
Expand All @@ -299,10 +298,11 @@ require (
go.lsp.dev/pkg v0.0.0-20210717090340-384b27a52fb2 // indirect
go.mongodb.org/mongo-driver v1.17.2 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/detectors/gcp v1.33.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 // indirect
go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
go.uber.org/automaxprocs v1.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
Expand All @@ -311,13 +311,13 @@ require (
golang.org/x/net v0.34.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.9.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250122153221-138b5a5a4fd4 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gotest.tools/v3 v3.5.1 // indirect
k8s.io/cli-runtime v0.32.0 // indirect
k8s.io/cli-runtime v0.32.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
Expand Down
Loading
Loading