From a686b8f4b9e00965a549e7d7172fb78ad15adde9 Mon Sep 17 00:00:00 2001 From: EKS Distro PR Bot <75336432+eks-distro-pr-bot@users.noreply.github.com> Date: Fri, 19 Apr 2024 01:44:55 -0700 Subject: [PATCH] Bump kubernetes-sigs/cri-tools to latest release (#3098) --- UPSTREAM_PROJECTS.yaml | 4 +- .../kubernetes-sigs/cri-tools/ATTRIBUTION.txt | 82 +++++++++---------- projects/kubernetes-sigs/cri-tools/CHECKSUMS | 8 +- projects/kubernetes-sigs/cri-tools/GIT_TAG | 2 +- .../kubernetes-sigs/cri-tools/GOLANG_VERSION | 2 +- projects/kubernetes-sigs/cri-tools/README.md | 2 +- 6 files changed, 50 insertions(+), 50 deletions(-) diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml index c3d803a858..14b8032b70 100644 --- a/UPSTREAM_PROJECTS.yaml +++ b/UPSTREAM_PROJECTS.yaml @@ -193,8 +193,8 @@ projects: go_version: "1.21" - name: cri-tools versions: - - tag: v1.29.0 - go_version: "1.21" + - tag: v1.30.0 + go_version: "1.22" - name: etcdadm versions: - commit: f089d308442c18f487a52d09fd067ae9ac7cd8f2 diff --git a/projects/kubernetes-sigs/cri-tools/ATTRIBUTION.txt b/projects/kubernetes-sigs/cri-tools/ATTRIBUTION.txt index 8d13808602..200c081c13 100644 --- a/projects/kubernetes-sigs/cri-tools/ATTRIBUTION.txt +++ b/projects/kubernetes-sigs/cri-tools/ATTRIBUTION.txt @@ -1,11 +1,11 @@ -** github.com/docker/docker/api/types/time; version v24.0.7+incompatible -- +** github.com/docker/docker/api/types/time; version v26.0.1+incompatible -- https://github.com/moby/moby ** github.com/docker/go-units; version v0.5.0 -- https://github.com/docker/go-units -** github.com/go-logr/logr; version v1.3.0 -- +** github.com/go-logr/logr; version v1.4.1 -- https://github.com/go-logr/logr ** github.com/go-logr/stdr; version v1.2.2 -- @@ -26,7 +26,7 @@ https://github.com/google/gnostic-models ** github.com/google/gofuzz; version v1.2.0 -- https://github.com/google/gofuzz -** github.com/kubernetes-sigs/cri-tools; version v1.29.0 -- +** github.com/kubernetes-sigs/cri-tools; version v1.30.0 -- https://github.com/kubernetes-sigs/cri-tools ** github.com/matttproud/golang_protobuf_extensions/pbutil; version v1.0.4 -- @@ -65,79 +65,79 @@ https://github.com/open-telemetry/opentelemetry-go-contrib ** go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp; version v0.44.0 -- https://github.com/open-telemetry/opentelemetry-go-contrib -** go.opentelemetry.io/otel; version v1.19.0 -- +** go.opentelemetry.io/otel; version v1.25.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/exporters/otlp/otlptrace; version v1.19.0 -- +** go.opentelemetry.io/otel/exporters/otlp/otlptrace; version v1.25.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc; version v1.19.0 -- +** go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc; version v1.25.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/metric; version v1.19.0 -- +** go.opentelemetry.io/otel/metric; version v1.25.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/sdk; version v1.19.0 -- +** go.opentelemetry.io/otel/sdk; version v1.25.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/trace; version v1.19.0 -- +** go.opentelemetry.io/otel/trace; version v1.25.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/proto/otlp; version v1.0.0 -- +** go.opentelemetry.io/proto/otlp; version v1.1.0 -- https://github.com/open-telemetry/opentelemetry-proto-go -** google.golang.org/genproto/googleapis/api/httpbody; version v0.0.0-20230726155614-23370e0ffb3e -- +** google.golang.org/genproto/googleapis/api/httpbody; version v0.0.0-20240227224415-6ceb2ff114de -- https://github.com/googleapis/go-genproto -** google.golang.org/genproto/googleapis/rpc; version v0.0.0-20230822172742-b8732ec3820d -- +** google.golang.org/genproto/googleapis/rpc; version v0.0.0-20240401170217-c3f982113cda -- https://github.com/googleapis/go-genproto -** google.golang.org/grpc; version v1.58.3 -- +** google.golang.org/grpc; version v1.63.0 -- https://github.com/grpc/grpc-go ** gopkg.in/yaml.v2; version v2.4.0 -- https://gopkg.in/yaml.v2 -** k8s.io/kubernetes/staging/src/k8s.io/api; version v0.0.0-20231207112802-e4636d05bc32 -- +** k8s.io/kubernetes/staging/src/k8s.io/api; version v0.0.0-20240417172702-7c48c2bd72b9 -- https://github.com/kubernetes/kubernetes -** k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver; version v0.0.0-20231207112802-e4636d05bc32 -- +** k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver; version v0.0.0-20240417172702-7c48c2bd72b9 -- https://github.com/kubernetes/kubernetes -** k8s.io/kubernetes/staging/src/k8s.io/apimachinery; version v0.0.0-20231207112802-e4636d05bc32 -- +** k8s.io/kubernetes/staging/src/k8s.io/apimachinery; version v0.0.0-20240417172702-7c48c2bd72b9 -- https://github.com/kubernetes/kubernetes -** k8s.io/kubernetes/staging/src/k8s.io/apiserver; version v0.0.0-20231207112802-e4636d05bc32 -- +** k8s.io/kubernetes/staging/src/k8s.io/apiserver; version v0.0.0-20240417172702-7c48c2bd72b9 -- https://github.com/kubernetes/kubernetes -** k8s.io/kubernetes/staging/src/k8s.io/cli-runtime; version v0.0.0-20231207112802-e4636d05bc32 -- +** k8s.io/kubernetes/staging/src/k8s.io/cli-runtime; version v0.0.0-20240417172702-7c48c2bd72b9 -- https://github.com/kubernetes/kubernetes -** k8s.io/kubernetes/staging/src/k8s.io/client-go; version v0.0.0-20231207112802-e4636d05bc32 -- +** k8s.io/kubernetes/staging/src/k8s.io/client-go; version v0.0.0-20240417172702-7c48c2bd72b9 -- https://github.com/kubernetes/kubernetes -** k8s.io/kubernetes/staging/src/k8s.io/component-base; version v0.0.0-20231207112802-e4636d05bc32 -- +** k8s.io/kubernetes/staging/src/k8s.io/component-base; version v0.0.0-20240417172702-7c48c2bd72b9 -- https://github.com/kubernetes/kubernetes -** k8s.io/kubernetes/staging/src/k8s.io/cri-api; version v0.0.0-20231207112802-e4636d05bc32 -- +** k8s.io/kubernetes/staging/src/k8s.io/cri-api; version v0.0.0-20240417172702-7c48c2bd72b9 -- https://github.com/kubernetes/kubernetes -** k8s.io/klog/v2; version v2.110.1 -- +** k8s.io/klog/v2; version v2.120.1 -- https://github.com/kubernetes/klog -** k8s.io/kube-openapi/pkg; version v0.0.0-20231010175941-2dd684a91f00 -- +** k8s.io/kube-openapi/pkg; version v0.0.0-20240228011516-70dd3763d340 -- https://github.com/kubernetes/kube-openapi -** k8s.io/kube-openapi/pkg/validation/spec; version v0.0.0-20231010175941-2dd684a91f00 -- +** k8s.io/kube-openapi/pkg/validation/spec; version v0.0.0-20240228011516-70dd3763d340 -- https://github.com/kubernetes/kube-openapi -** k8s.io/kubernetes/staging/src/k8s.io/kubectl; version v0.0.0-20231207112802-e4636d05bc32 -- +** k8s.io/kubernetes/staging/src/k8s.io/kubectl; version v0.0.0-20240417172702-7c48c2bd72b9 -- https://github.com/kubernetes/kubernetes -** k8s.io/kubernetes/staging/src/k8s.io/kubelet; version v0.0.0-20231207112802-e4636d05bc32 -- +** k8s.io/kubernetes/staging/src/k8s.io/kubelet; version v0.0.0-20240417172702-7c48c2bd72b9 -- https://github.com/kubernetes/kubernetes -** k8s.io/kubernetes/pkg; version v1.29.0-rc.2 -- +** k8s.io/kubernetes/pkg; version v1.30.0 -- https://github.com/kubernetes/kubernetes ** k8s.io/utils; version v0.0.0-20230726121419-3b25d923346b -- @@ -613,7 +613,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/golang/protobuf; version v1.5.3 -- +** github.com/golang/protobuf; version v1.5.4 -- https://github.com/golang/protobuf Copyright 2010 The Go Authors. All rights reserved. @@ -647,7 +647,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/google/uuid; version v1.4.0 -- +** github.com/google/uuid; version v1.6.0 -- https://github.com/google/uuid Copyright (c) 2009,2014 Google Inc. All rights reserved. @@ -680,7 +680,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/grpc-ecosystem/grpc-gateway/v2; version v2.16.0 -- +** github.com/grpc-ecosystem/grpc-gateway/v2; version v2.19.0 -- https://github.com/grpc-ecosystem/grpc-gateway/v2 Copyright (c) 2015, Gengo, Inc. @@ -716,19 +716,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ** github.com/liggitt/tabwriter; version v0.0.0-20181228230101-89fcab3d43de -- https://github.com/liggitt/tabwriter -** golang.org/go; version go1.21.8 -- +** golang.org/go; version go1.22.1 -- https://github.com/golang/go -** golang.org/x/net; version v0.19.0 -- +** golang.org/x/net; version v0.24.0 -- https://golang.org/x/net -** golang.org/x/oauth2; version v0.10.0 -- +** golang.org/x/oauth2; version v0.17.0 -- https://golang.org/x/oauth2 -** golang.org/x/sys/unix; version v0.15.0 -- +** golang.org/x/sys/unix; version v0.19.0 -- https://golang.org/x/sys -** golang.org/x/term; version v0.15.0 -- +** golang.org/x/term; version v0.19.0 -- https://golang.org/x/term ** golang.org/x/text; version v0.14.0 -- @@ -737,10 +737,10 @@ https://golang.org/x/text ** golang.org/x/time/rate; version v0.3.0 -- https://golang.org/x/time -** k8s.io/kubernetes/staging/src/k8s.io/apimachinery; version v0.0.0-20231207112802-e4636d05bc32 -- +** k8s.io/kubernetes/staging/src/k8s.io/apimachinery; version v0.0.0-20240417172702-7c48c2bd72b9 -- https://github.com/kubernetes/kubernetes -** k8s.io/kubernetes/staging/src/k8s.io/client-go; version v0.0.0-20231207112802-e4636d05bc32 -- +** k8s.io/kubernetes/staging/src/k8s.io/client-go; version v0.0.0-20240417172702-7c48c2bd72b9 -- https://github.com/kubernetes/kubernetes Copyright (c) 2009 The Go Authors. All rights reserved. @@ -915,7 +915,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** google.golang.org/protobuf; version v1.31.0 -- +** google.golang.org/protobuf; version v1.33.0 -- https://go.googlesource.com/protobuf Copyright (c) 2018 The Go Authors. All rights reserved. @@ -982,7 +982,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json; version v0.0.0-20231010175941-2dd684a91f00 -- +** k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json; version v0.0.0-20240228011516-70dd3763d340 -- https://github.com/kubernetes/kube-openapi Copyright (c) 2020 The Go Authors. All rights reserved. @@ -1077,7 +1077,7 @@ Copyright (C) 2013 Blake Mizerany https://github.com/blang/semver/v4 Copyright (c) 2014 Benedikt Lang -** github.com/cenkalti/backoff/v4; version v4.2.1 -- +** github.com/cenkalti/backoff/v4; version v4.3.0 -- https://github.com/cenkalti/backoff/v4 Copyright (c) 2014 Cenk Altı @@ -1117,7 +1117,7 @@ Copyright (c) 2014 Mitchell Hashimoto https://github.com/sirupsen/logrus Copyright (c) 2014 Simon Eskildsen -** github.com/urfave/cli/v2; version v2.26.0 -- +** github.com/urfave/cli/v2; version v2.27.1 -- https://github.com/urfave/cli/v2 Copyright (c) 2022 urfave/cli maintainers diff --git a/projects/kubernetes-sigs/cri-tools/CHECKSUMS b/projects/kubernetes-sigs/cri-tools/CHECKSUMS index 3823999ad4..08b6250e9c 100644 --- a/projects/kubernetes-sigs/cri-tools/CHECKSUMS +++ b/projects/kubernetes-sigs/cri-tools/CHECKSUMS @@ -1,4 +1,4 @@ -00dc2f1a51522a493a4bc87544445638c033b499bd9486e532917a81c4da13bd _output/bin/cri-tools/linux-amd64/crictl -e7bd21c55eeb381e51b53d8ec20921e267d9bad887d0a9bb3518f61dda76d70e _output/bin/cri-tools/linux-amd64/critest -70734c0cb217bc21815986a7f0901c8226cd761c941bad4edcfb848a9cb0e83b _output/bin/cri-tools/linux-arm64/crictl -833d441c85723fb8f293c05eb2f16d82eed6d9cf39a34bdadc3fcc508d5c4828 _output/bin/cri-tools/linux-arm64/critest +a2ab72bea1c7e892649bec651c83a2ede31c494d527cc12b25b78fb568d9bf9f _output/bin/cri-tools/linux-amd64/crictl +a7583697fa5ca85e4db40fe3dbeb847101c4ad19bd546d4a1b3a7693ab48952d _output/bin/cri-tools/linux-amd64/critest +55ac94e1c241b83c32e08207da491a30fef074dc1ec307ba79eb5a02735b7af9 _output/bin/cri-tools/linux-arm64/crictl +c54622808911e2bc4fa9c0aa38af3a4f70c7b002480db77767af49d1792953c5 _output/bin/cri-tools/linux-arm64/critest diff --git a/projects/kubernetes-sigs/cri-tools/GIT_TAG b/projects/kubernetes-sigs/cri-tools/GIT_TAG index 9b277b94ac..c8c2eaea50 100644 --- a/projects/kubernetes-sigs/cri-tools/GIT_TAG +++ b/projects/kubernetes-sigs/cri-tools/GIT_TAG @@ -1 +1 @@ -v1.29.0 +v1.30.0 diff --git a/projects/kubernetes-sigs/cri-tools/GOLANG_VERSION b/projects/kubernetes-sigs/cri-tools/GOLANG_VERSION index d2ab029d32..71f7f51df9 100644 --- a/projects/kubernetes-sigs/cri-tools/GOLANG_VERSION +++ b/projects/kubernetes-sigs/cri-tools/GOLANG_VERSION @@ -1 +1 @@ -1.21 +1.22 diff --git a/projects/kubernetes-sigs/cri-tools/README.md b/projects/kubernetes-sigs/cri-tools/README.md index 4b5523a51f..91ebf29e8b 100644 --- a/projects/kubernetes-sigs/cri-tools/README.md +++ b/projects/kubernetes-sigs/cri-tools/README.md @@ -1,5 +1,5 @@ ## **CRI Tools** -![Version](https://img.shields.io/badge/version-v1.29.0-blue) +![Version](https://img.shields.io/badge/version-v1.30.0-blue) ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiUUlRZXJEVUxWcjI1OE8weVdXQnY4alBSU1lxVm1FOGVoZE83VldDbjJiaFBtY25XT3NIK1RhckZkQXZGclZDSkVLUG5PMmd5K2J2RVlSYk9pclUybC9zPSIsIml2UGFyYW1ldGVyU3BlYyI6IkF3RGUzVDFhVlB0eUlGMWwiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main) The [CRI tools project](https://github.com/kubernetes-sigs/cri-tools) provides a CLI and validation tools for the `kubelet`'s Container Runtime Interface (CRI). This allows CRI runtime developers to debug their runtimes (like `containerd`, `CRI-O`, etc.) without needing to set up Kubernetes components. The `crictl` CLI can perform numerous functions such as running containers, fetching logs, listing conatiner stats, removing images, etc.