Merge pull request #7066 from kushagra98/master

Update k/k vendor to 1.31.0-beta.0
kubernetes · Jul 17, 2024 · 328244d · 328244d
2 parents 5077f48 + 11a881e
commit 328244d
Show file tree

Hide file tree

Showing 4 changed files with 211 additions and 218 deletions.
diff --git a/cluster-autoscaler/go.mod b/cluster-autoscaler/go.mod
@@ -18,7 +18,7 @@ require (
 	github.com/Azure/go-autorest/autorest/to v0.4.0
 	github.com/Azure/skewer v0.0.14
 	github.com/aws/aws-sdk-go v1.44.241
-	github.com/cenkalti/backoff/v4 v4.2.1
+	github.com/cenkalti/backoff/v4 v4.3.0
 	github.com/digitalocean/godo v1.27.0
 	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/golang/mock v1.6.0
@@ -29,34 +29,34 @@ require (
 	github.com/jmespath/go-jmespath v0.4.0
 	github.com/json-iterator/go v1.1.12
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.19.0
+	github.com/prometheus/client_golang v1.19.1
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.8.4
+	github.com/stretchr/testify v1.9.0
 	github.com/vburenin/ifacemaker v1.2.1
 	go.uber.org/mock v0.4.0
-	golang.org/x/crypto v0.23.0
-	golang.org/x/net v0.25.0
-	golang.org/x/oauth2 v0.20.0
-	golang.org/x/sys v0.20.0
+	golang.org/x/crypto v0.24.0
+	golang.org/x/net v0.26.0
+	golang.org/x/oauth2 v0.21.0
+	golang.org/x/sys v0.21.0
 	google.golang.org/api v0.151.0
-	google.golang.org/grpc v1.59.0
-	google.golang.org/protobuf v1.33.0
+	google.golang.org/grpc v1.65.0
+	google.golang.org/protobuf v1.34.2
 	gopkg.in/gcfg.v1 v1.2.3
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.31.0-alpha.2
-	k8s.io/apimachinery v0.31.0-alpha.2
-	k8s.io/apiserver v0.31.0-alpha.2
+	k8s.io/api v0.31.0-beta.0
+	k8s.io/apimachinery v0.31.0-beta.0
+	k8s.io/apiserver v0.31.0-beta.0
 	k8s.io/autoscaler/cluster-autoscaler/apis v0.0.0-20240627115740-d52e4b9665d7
-	k8s.io/client-go v0.31.0-alpha.2
+	k8s.io/client-go v0.31.0-beta.0
 	k8s.io/cloud-provider v0.30.0-alpha.3
 	k8s.io/cloud-provider-aws v1.27.0
 	k8s.io/cloud-provider-gcp/providers v0.28.2
-	k8s.io/component-base v0.31.0-alpha.2
-	k8s.io/component-helpers v0.31.0-alpha.2
-	k8s.io/klog/v2 v2.120.1
-	k8s.io/kubelet v0.31.0-alpha.2
-	k8s.io/kubernetes v1.31.0-alpha.2
-	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
+	k8s.io/component-base v0.31.0-beta.0
+	k8s.io/component-helpers v0.31.0-beta.0
+	k8s.io/klog/v2 v2.130.1
+	k8s.io/kubelet v0.31.0-beta.0
+	k8s.io/kubernetes v1.31.0-beta.0
+	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
 	sigs.k8s.io/cloud-provider-azure v1.28.0
 	sigs.k8s.io/yaml v1.4.0
 )
@@ -74,14 +74,14 @@ require (
 	github.com/GoogleCloudPlatform/k8s-cloud-provider v1.25.0 // indirect
 	github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
 	github.com/Microsoft/go-winio v0.6.0 // indirect
-	github.com/Microsoft/hcsshim v0.8.25 // indirect
+	github.com/Microsoft/hcsshim v0.8.26 // indirect
 	github.com/NYTimes/gziphandler v1.1.1 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
 	github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect
 	github.com/cilium/ebpf v0.9.1 // indirect
 	github.com/container-storage-interface/spec v1.9.0 // indirect
@@ -100,8 +100,8 @@ require (
 	github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/fxamacker/cbor/v2 v2.7.0-beta // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -124,7 +124,7 @@ require (
 	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
 	github.com/imdario/mergo v0.3.15 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jessevdk/go-flags v1.4.1-0.20181029123624-5de817a9aa20 // indirect
@@ -135,8 +135,8 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/moby/spdystream v0.2.0 // indirect
-	github.com/moby/sys/mountinfo v0.6.2 // indirect
+	github.com/moby/spdystream v0.4.0 // indirect
+	github.com/moby/sys/mountinfo v0.7.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb // indirect
@@ -146,63 +146,62 @@ require (
 	github.com/onsi/ginkgo/v2 v2.19.0 // indirect
 	github.com/onsi/gomega v1.33.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/runc v1.1.12 // indirect
+	github.com/opencontainers/runc v1.1.13 // indirect
 	github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 // indirect
 	github.com/opencontainers/selinux v1.11.0 // indirect
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_model v0.6.0 // indirect
-	github.com/prometheus/common v0.48.0 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.55.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/seccomp/libseccomp-golang v0.10.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/spf13/cobra v1.8.0 // indirect
+	github.com/spf13/cobra v1.8.1 // indirect
 	github.com/stoewer/go-strcase v1.3.0 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
 	github.com/vishvananda/netlink v1.1.0 // indirect
 	github.com/vishvananda/netns v0.0.4 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.13 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.13 // indirect
-	go.etcd.io/etcd/client/v3 v3.5.13 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.14 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.14 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.42.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
-	go.opentelemetry.io/otel v1.21.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
-	go.opentelemetry.io/otel/metric v1.21.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.21.0 // indirect
-	go.opentelemetry.io/otel/trace v1.21.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
+	go.opentelemetry.io/otel v1.28.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
+	go.opentelemetry.io/otel/metric v1.28.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.28.0 // indirect
+	go.opentelemetry.io/otel/trace v1.28.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
 	golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
 	golang.org/x/mod v0.17.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/term v0.20.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/term v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.21.0 // indirect
-	google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
+	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.0.0 // indirect
-	k8s.io/code-generator v0.31.0-alpha.2 // indirect
-	k8s.io/controller-manager v0.31.0-alpha.2 // indirect
-	k8s.io/cri-api v0.31.0-alpha.2 // indirect
+	k8s.io/code-generator v0.31.0-beta.0 // indirect
+	k8s.io/controller-manager v0.31.0-beta.0 // indirect
+	k8s.io/cri-api v0.31.0-beta.0 // indirect
 	k8s.io/cri-client v0.0.0 // indirect
 	k8s.io/csi-translation-lib v0.27.0 // indirect
 	k8s.io/dynamic-resource-allocation v0.0.0 // indirect
 	k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
-	k8s.io/kms v0.31.0-alpha.2 // indirect
+	k8s.io/kms v0.31.0-beta.0 // indirect
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
 	k8s.io/kube-scheduler v0.0.0 // indirect
 	k8s.io/kubectl v0.28.0 // indirect
@@ -218,64 +217,64 @@ replace github.com/digitalocean/godo => github.com/digitalocean/godo v1.27.0
 
 replace github.com/rancher/go-rancher => github.com/rancher/go-rancher v0.1.0
 
-replace k8s.io/api => k8s.io/api v0.31.0-alpha.2
+replace k8s.io/api => k8s.io/api v0.31.0-beta.0
 
-replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.0-alpha.2
+replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.0-beta.0
 
-replace k8s.io/apimachinery => k8s.io/apimachinery v0.31.0-alpha.2
+replace k8s.io/apimachinery => k8s.io/apimachinery v0.31.0-beta.0
 
-replace k8s.io/apiserver => k8s.io/apiserver v0.31.0-alpha.2
+replace k8s.io/apiserver => k8s.io/apiserver v0.31.0-beta.0
 
-replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.0-alpha.2
+replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.0-beta.0
 
-replace k8s.io/client-go => k8s.io/client-go v0.31.0-alpha.2
+replace k8s.io/client-go => k8s.io/client-go v0.31.0-beta.0
 
-replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.0-alpha.2
+replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.0-beta.0
 
-replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.0-alpha.2
+replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.0-beta.0
 
-replace k8s.io/code-generator => k8s.io/code-generator v0.31.0-alpha.2
+replace k8s.io/code-generator => k8s.io/code-generator v0.31.0-beta.0
 
-replace k8s.io/component-base => k8s.io/component-base v0.31.0-alpha.2
+replace k8s.io/component-base => k8s.io/component-base v0.31.0-beta.0
 
-replace k8s.io/component-helpers => k8s.io/component-helpers v0.31.0-alpha.2
+replace k8s.io/component-helpers => k8s.io/component-helpers v0.31.0-beta.0
 
-replace k8s.io/controller-manager => k8s.io/controller-manager v0.31.0-alpha.2
+replace k8s.io/controller-manager => k8s.io/controller-manager v0.31.0-beta.0
 
-replace k8s.io/cri-api => k8s.io/cri-api v0.31.0-alpha.2
+replace k8s.io/cri-api => k8s.io/cri-api v0.31.0-beta.0
 
-replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.0-alpha.2
+replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.0-beta.0
 
-replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.0-alpha.2
+replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.0-beta.0
 
-replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.0-alpha.2
+replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.0-beta.0
 
-replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.0-alpha.2
+replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.0-beta.0
 
-replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.0-alpha.2
+replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.0-beta.0
 
-replace k8s.io/kubectl => k8s.io/kubectl v0.31.0-alpha.2
+replace k8s.io/kubectl => k8s.io/kubectl v0.31.0-beta.0
 
-replace k8s.io/kubelet => k8s.io/kubelet v0.31.0-alpha.2
+replace k8s.io/kubelet => k8s.io/kubelet v0.31.0-beta.0
 
-replace k8s.io/metrics => k8s.io/metrics v0.31.0-alpha.2
+replace k8s.io/metrics => k8s.io/metrics v0.31.0-beta.0
 
-replace k8s.io/mount-utils => k8s.io/mount-utils v0.31.0-alpha.2
+replace k8s.io/mount-utils => k8s.io/mount-utils v0.31.0-beta.0
 
-replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.0-alpha.2
+replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.0-beta.0
 
-replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.0-alpha.2
+replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.0-beta.0
 
-replace k8s.io/sample-controller => k8s.io/sample-controller v0.31.0-alpha.2
+replace k8s.io/sample-controller => k8s.io/sample-controller v0.31.0-beta.0
 
-replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.0-alpha.2
+replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.0-beta.0
 
-replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.0-alpha.2
+replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.0-beta.0
 
-replace k8s.io/kms => k8s.io/kms v0.31.0-alpha.2
+replace k8s.io/kms => k8s.io/kms v0.31.0-beta.0
 
-replace k8s.io/endpointslice => k8s.io/endpointslice v0.31.0-alpha.2
+replace k8s.io/endpointslice => k8s.io/endpointslice v0.31.0-beta.0
 
 replace k8s.io/autoscaler/cluster-autoscaler/apis => ./apis
 
-replace k8s.io/cri-client => k8s.io/cri-client v0.31.0-alpha.2
+replace k8s.io/cri-client => k8s.io/cri-client v0.31.0-beta.0