From 210ef3a348691112ffb23e100c16fdb428c4e2c5 Mon Sep 17 00:00:00 2001 From: EKS Distro PR Bot Date: Mon, 23 Dec 2024 08:09:39 +0000 Subject: [PATCH] Bump kubernetes-sigs/cri-tools to latest release --- UPSTREAM_PROJECTS.yaml | 4 +- .../kubernetes-sigs/cri-tools/ATTRIBUTION.txt | 113 ++++++++---------- 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, 56 insertions(+), 75 deletions(-) diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml index 7c64abefc8..bbdc82ec56 100644 --- a/UPSTREAM_PROJECTS.yaml +++ b/UPSTREAM_PROJECTS.yaml @@ -193,8 +193,8 @@ projects: go_version: "1.22" - name: cri-tools versions: - - tag: v1.31.1 - go_version: "1.22" + - tag: v1.32.0 + go_version: "1.23" - name: etcdadm versions: - commit: f089d308442c18f487a52d09fd067ae9ac7cd8f2 diff --git a/projects/kubernetes-sigs/cri-tools/ATTRIBUTION.txt b/projects/kubernetes-sigs/cri-tools/ATTRIBUTION.txt index 4a22f8acf8..4fe21b6355 100644 --- a/projects/kubernetes-sigs/cri-tools/ATTRIBUTION.txt +++ b/projects/kubernetes-sigs/cri-tools/ATTRIBUTION.txt @@ -2,7 +2,7 @@ ** github.com/distribution/reference; version v0.6.0 -- https://github.com/distribution/reference -** github.com/docker/docker/api/types/time; version v27.1.1+incompatible -- +** github.com/docker/docker/api/types/time; version v27.3.1+incompatible -- https://github.com/moby/moby ** github.com/docker/go-units; version v0.5.0 -- @@ -17,7 +17,7 @@ https://github.com/go-logr/stdr ** github.com/google/gofuzz; version v1.2.0 -- https://github.com/google/gofuzz -** github.com/moby/spdystream; version v0.4.0 -- +** github.com/moby/spdystream; version v0.5.0 -- https://github.com/moby/spdystream ** github.com/moby/term; version v0.5.0 -- @@ -44,6 +44,9 @@ https://github.com/prometheus/common ** github.com/prometheus/procfs; version v0.15.1 -- https://github.com/prometheus/procfs +** github.com/spf13/cobra; version v1.8.1 -- +https://github.com/spf13/cobra + ** github.com/wk8/go-ordered-map/v2; version v2.1.8 -- https://github.com/wk8/go-ordered-map/v2 @@ -53,79 +56,76 @@ https://github.com/open-telemetry/opentelemetry-go-contrib ** go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp; version v0.53.0 -- https://github.com/open-telemetry/opentelemetry-go-contrib -** go.opentelemetry.io/otel; version v1.28.0 -- +** go.opentelemetry.io/otel; version v1.32.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/exporters/otlp/otlptrace; version v1.28.0 -- +** go.opentelemetry.io/otel/exporters/otlp/otlptrace; version v1.32.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc; version v1.28.0 -- +** go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc; version v1.32.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/metric; version v1.28.0 -- +** go.opentelemetry.io/otel/metric; version v1.32.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/sdk; version v1.28.0 -- +** go.opentelemetry.io/otel/sdk; version v1.32.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/trace; version v1.28.0 -- +** go.opentelemetry.io/otel/trace; version v1.32.0 -- https://github.com/open-telemetry/opentelemetry-go ** go.opentelemetry.io/proto/otlp; version v1.3.1 -- https://github.com/open-telemetry/opentelemetry-proto-go -** google.golang.org/genproto/googleapis/api/httpbody; version v0.0.0-20240701130421-f6361c86f094 -- +** google.golang.org/genproto/googleapis/api/httpbody; version v0.0.0-20241104194629-dd2ea8efbc28 -- https://github.com/googleapis/go-genproto -** google.golang.org/genproto/googleapis/rpc; version v0.0.0-20240701130421-f6361c86f094 -- +** google.golang.org/genproto/googleapis/rpc; version v0.0.0-20241104194629-dd2ea8efbc28 -- https://github.com/googleapis/go-genproto -** google.golang.org/grpc; version v1.65.0 -- +** google.golang.org/grpc; version v1.68.1 -- https://github.com/grpc/grpc-go -** gopkg.in/yaml.v2; version v2.4.0 -- -https://gopkg.in/yaml.v2 - -** k8s.io/api/core/v1; version v0.31.0-rc.1 -- +** k8s.io/api/core/v1; version v0.32.0-rc.2 -- https://github.com/kubernetes/api -** k8s.io/apimachinery/pkg; version v0.31.0-rc.1 -- +** k8s.io/apimachinery/pkg; version v0.32.0-rc.2 -- https://github.com/kubernetes/apimachinery -** k8s.io/cli-runtime/pkg/printers; version v0.31.0-rc.1 -- +** k8s.io/cli-runtime/pkg/printers; version v0.32.0-rc.2 -- https://github.com/kubernetes/cli-runtime -** k8s.io/client-go; version v0.31.0-rc.1 -- +** k8s.io/client-go; version v0.32.0-rc.2 -- https://github.com/kubernetes/client-go -** k8s.io/component-base; version v0.31.0-rc.1 -- +** k8s.io/component-base; version v0.32.0-rc.2 -- https://github.com/kubernetes/component-base -** k8s.io/cri-api/pkg/apis; version v0.31.0-rc.1 -- +** k8s.io/cri-api/pkg/apis; version v0.32.0-rc.2 -- https://github.com/kubernetes/cri-api -** k8s.io/cri-client/pkg; version v0.31.0-rc.1 -- +** k8s.io/cri-client/pkg; version v0.32.0-rc.2 -- https://github.com/kubernetes/cri-client ** k8s.io/klog/v2; version v2.130.1 -- https://github.com/kubernetes/klog -** k8s.io/kubectl/pkg/util; version v0.31.0-rc.1 -- +** k8s.io/kubectl/pkg/util; version v0.32.0-rc.2 -- https://github.com/kubernetes/kubectl -** k8s.io/kubelet/pkg/types; version v0.31.0-rc.1 -- +** k8s.io/kubelet/pkg/types; version v0.32.0-rc.2 -- https://github.com/kubernetes/kubelet -** k8s.io/utils; version v0.0.0-20240711033017-18e509b52bc8 -- +** k8s.io/utils; version v0.0.0-20241104100929-3ea5e8cea738 -- https://github.com/kubernetes/utils -** sigs.k8s.io/cri-tools; version v1.31.1 -- +** sigs.k8s.io/cri-tools; version v1.32.0 -- https://github.com/kubernetes-sigs/cri-tools -** sigs.k8s.io/json; version v0.0.0-20221116044647-bc3834ca7abd -- +** sigs.k8s.io/json; version v0.0.0-20241010143419-9aa6b5e7a4b3 -- https://github.com/kubernetes-sigs/json -** sigs.k8s.io/structured-merge-diff/v4/value; version v4.4.1 -- +** sigs.k8s.io/structured-merge-diff/v4/value; version v4.4.2 -- https://github.com/kubernetes-sigs/structured-merge-diff ** sigs.k8s.io/yaml; version v1.4.0 -- @@ -420,22 +420,6 @@ This product includes software developed at SoundCloud Ltd. (http://soundcloud.com/). -* For gopkg.in/yaml.v2 see also this required NOTICE: -Copyright 2011-2016 Canonical Ltd. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - - * For sigs.k8s.io/yaml/goyaml.v2 see also this required NOTICE: Copyright 2011-2016 Canonical Ltd. @@ -522,19 +506,13 @@ https://github.com/bahlo/generic-list-go ** github.com/liggitt/tabwriter; version v0.0.0-20181228230101-89fcab3d43de -- https://github.com/liggitt/tabwriter -** golang.org/go; version go1.22.10 -- +** golang.org/go; version go1.23.4 -- https://github.com/golang/go -** golang.org/x/oauth2; version v0.21.0 -- -https://golang.org/x/oauth2 - -** golang.org/x/time/rate; version v0.3.0 -- -https://golang.org/x/time - -** k8s.io/apimachinery/third_party/forked/golang; version v0.31.0-rc.1 -- +** k8s.io/apimachinery/third_party/forked/golang; version v0.32.0-rc.2 -- https://github.com/kubernetes/apimachinery -** k8s.io/client-go/third_party/forked/golang/template; version v0.31.0-rc.1 -- +** k8s.io/client-go/third_party/forked/golang/template; version v0.32.0-rc.2 -- https://github.com/kubernetes/client-go Copyright (c) 2009 The Go Authors. All rights reserved. @@ -705,7 +683,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/grpc-ecosystem/grpc-gateway/v2; version v2.20.0 -- +** github.com/grpc-ecosystem/grpc-gateway/v2; version v2.23.0 -- https://github.com/grpc-ecosystem/grpc-gateway/v2 Copyright (c) 2015, Gengo, Inc. @@ -844,21 +822,24 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** golang.org/x/exp; version v0.0.0-20240719175910-8a7402abbf56 -- -https://golang.org/x/exp - -** golang.org/x/net; version v0.28.0 -- +** golang.org/x/net; version v0.30.0 -- https://golang.org/x/net -** golang.org/x/sys/unix; version v0.23.0 -- +** golang.org/x/oauth2; version v0.23.0 -- +https://golang.org/x/oauth2 + +** golang.org/x/sys/unix; version v0.28.0 -- https://golang.org/x/sys -** golang.org/x/term; version v0.23.0 -- +** golang.org/x/term; version v0.27.0 -- https://golang.org/x/term -** golang.org/x/text; version v0.17.0 -- +** golang.org/x/text; version v0.21.0 -- https://golang.org/x/text +** golang.org/x/time/rate; version v0.7.0 -- +https://golang.org/x/time + Copyright 2009 The Go Authors. Redistribution and use in source and binary forms, with or without @@ -889,7 +870,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** google.golang.org/protobuf; version v1.34.2 -- +** google.golang.org/protobuf; version v1.35.2 -- https://go.googlesource.com/protobuf Copyright (c) 2018 The Go Authors. All rights reserved. @@ -956,7 +937,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** k8s.io/utils/internal/third_party/forked/golang/net; version v0.0.0-20240711033017-18e509b52bc8 -- +** k8s.io/utils/internal/third_party/forked/golang/net; version v0.0.0-20241104100929-3ea5e8cea738 -- https://github.com/kubernetes/utils Copyright (c) 2012 The Go Authors. All rights reserved. @@ -1030,7 +1011,7 @@ Copyright (c) 2014 Cenk Altı https://github.com/cespare/xxhash/v2 Copyright (c) 2016 Caleb Spare -** github.com/cpuguy83/go-md2man/v2/md2man; version v2.0.4 -- +** github.com/cpuguy83/go-md2man/v2/md2man; version v2.0.5 -- https://github.com/cpuguy83/go-md2man/v2 Copyright (c) 2014 Brian Goff @@ -1058,11 +1039,11 @@ Copyright (c) 2016 Mail.Ru Group https://github.com/mitchellh/go-wordwrap Copyright (c) 2014 Mitchell Hashimoto -** github.com/onsi/ginkgo/v2; version v2.20.0 -- +** github.com/onsi/ginkgo/v2; version v2.22.0 -- https://github.com/onsi/ginkgo/v2 Copyright (c) 2013-2014 Onsi Fakhouri -** github.com/onsi/gomega; version v1.34.1 -- +** github.com/onsi/gomega; version v1.36.0 -- https://github.com/onsi/gomega Copyright (c) 2013-2014 Onsi Fakhouri @@ -1070,7 +1051,7 @@ Copyright (c) 2013-2014 Onsi Fakhouri https://github.com/sirupsen/logrus Copyright (c) 2014 Simon Eskildsen -** github.com/urfave/cli/v2; version v2.27.3 -- +** github.com/urfave/cli/v2; version v2.27.5 -- 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 51019e02e7..e8890c0c90 100644 --- a/projects/kubernetes-sigs/cri-tools/CHECKSUMS +++ b/projects/kubernetes-sigs/cri-tools/CHECKSUMS @@ -1,4 +1,4 @@ -17665ae450ae3077f91cb8fdfc9b34f4ede86f98e8bf11d419c0d0d034d8d683 _output/bin/cri-tools/linux-amd64/crictl -2d101cc57b288a1f34dbaf3b8a7683e22defd485809dd3b05901f47ee6222bef _output/bin/cri-tools/linux-amd64/critest -c9d5d00b7c6338e4b5b796c5d72d153c507717ea09f7b84e9a6fcce406f8955b _output/bin/cri-tools/linux-arm64/crictl -b4e696ea0dc3587a4a0534a0e8c046b563064777a9fa6fbe14086075cf59812f _output/bin/cri-tools/linux-arm64/critest +57b2c6003d58442ad7e3fd94f7f3e7fa848b6ae1e61f4f72af1791433c777157 _output/bin/cri-tools/linux-amd64/crictl +6d78821d0f734a26f4a2a682bc8cd152638f670ed87bbe12b145669bd6498223 _output/bin/cri-tools/linux-amd64/critest +00a414b83991483222185558fa37ca9af670291a9645414f020c3c226a83033f _output/bin/cri-tools/linux-arm64/crictl +a52dba21f5868f4be3f0aaf3ffdf965977c19b8703eeb01339c876ac3434ce27 _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 085dad9405..6d101d3b1f 100644 --- a/projects/kubernetes-sigs/cri-tools/GIT_TAG +++ b/projects/kubernetes-sigs/cri-tools/GIT_TAG @@ -1 +1 @@ -v1.31.1 +v1.32.0 diff --git a/projects/kubernetes-sigs/cri-tools/GOLANG_VERSION b/projects/kubernetes-sigs/cri-tools/GOLANG_VERSION index 71f7f51df9..a1b6e17d61 100644 --- a/projects/kubernetes-sigs/cri-tools/GOLANG_VERSION +++ b/projects/kubernetes-sigs/cri-tools/GOLANG_VERSION @@ -1 +1 @@ -1.22 +1.23 diff --git a/projects/kubernetes-sigs/cri-tools/README.md b/projects/kubernetes-sigs/cri-tools/README.md index ebc728af7d..fa8d50a018 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.31.1-blue) +![Version](https://img.shields.io/badge/version-v1.32.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.