Skip to content

Commit

Permalink
Merge pull request #1076 from openshift-kni/bump-deps-k8s-1.31
Browse files Browse the repository at this point in the history 
Bump deps k8s 1.31
  • Loading branch information
@ffromani
ffromani authored Nov 15, 2024
2 parents bda4ff6 + 7ffd300 commit 1752344
Show file tree
Hide file tree
Showing 1,640 changed files with 65,418 additions and 43,646 deletions.
5 changes: 2 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:$(VERSION)
IMG ?= $(IMAGE_TAG_BASE):$(VERSION)
CRD_OPTIONS ?= "crd"
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.29
ENVTEST_K8S_VERSION = 1.30

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
Expand Down Expand Up @@ -290,10 +290,9 @@ KUSTOMIZE = $(shell pwd)/bin/kustomize
kustomize: ## Download kustomize locally if necessary.
$(call go-install-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected])

# use the last version before the bump golang 1.20 -> 1.22. We want to avoid the go.mod version format changes - for now.
ENVTEST = $(shell pwd)/bin/setup-envtest
envtest: ## Download envtest-setup locally if necessary.
$(call go-install-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@v0.0.0-20230927023946-553bd00cfec5)
$(call go-install-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.18)

# go-install-tool will 'go get' any package $2 and install it to $1.
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
Expand Down
112 changes: 57 additions & 55 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ require (
github.com/sergi/go-diff v1.1.0
github.com/stretchr/testify v1.9.0
golang.org/x/sync v0.7.0
k8s.io/api v0.30.6
k8s.io/apiextensions-apiserver v0.30.1
k8s.io/apimachinery v0.30.6
k8s.io/client-go v0.30.6
k8s.io/code-generator v0.30.6
k8s.io/klog/v2 v2.120.1
k8s.io/kubectl v0.30.6
k8s.io/kubelet v0.29.4
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
sigs.k8s.io/controller-runtime v0.18.3
k8s.io/api v0.31.2
k8s.io/apiextensions-apiserver v0.31.2
k8s.io/apimachinery v0.31.2
k8s.io/client-go v0.31.2
k8s.io/code-generator v0.31.2
k8s.io/klog/v2 v2.130.1
k8s.io/kubectl v0.31.2
k8s.io/kubelet v0.31.2
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
sigs.k8s.io/controller-runtime v0.19.1
sigs.k8s.io/yaml v1.4.0
)

Expand All @@ -51,9 +51,9 @@ require (
github.com/coreos/vcontext v0.0.0-20231102161604-685dc7299dc5 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
Expand All @@ -66,7 +66,7 @@ require (
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/imdario/mergo v0.3.16 // indirect
Expand All @@ -76,43 +76,45 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/spdystream v0.4.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/openshift/client-go v0.0.0-20240415214935-be70f772f157 // indirect
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.19.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/spf13/cobra v1.8.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.19.1 // 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/spf13/cobra v1.8.1 // indirect
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/vincent-petithory/dataurl v1.0.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.uber.org/ratelimit v0.2.0 // indirect
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/oauth2 v0.19.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sys v0.21.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.5.0 // indirect
golang.org/x/tools v0.21.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
google.golang.org/grpc v1.63.2 // indirect
google.golang.org/protobuf v1.34.1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/grpc v1.65.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
howett.net/plist v1.0.1 // indirect
k8s.io/component-base v0.30.6 // indirect
k8s.io/component-base v0.31.2 // indirect
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/kube-openapi v0.0.0-20240411171206-dc4e619f62f3 // indirect
Expand All @@ -121,29 +123,29 @@ require (
)

replace (
k8s.io/api => k8s.io/api v0.30.6
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.6
k8s.io/apimachinery => k8s.io/apimachinery v0.30.6
k8s.io/apiserver => k8s.io/apiserver v0.30.6
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.6
k8s.io/client-go => k8s.io/client-go v0.30.6
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.6
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.6
k8s.io/code-generator => k8s.io/code-generator v0.30.6
k8s.io/component-base => k8s.io/component-base v0.30.6
k8s.io/component-helpers => k8s.io/component-helpers v0.30.6
k8s.io/controller-manager => k8s.io/controller-manager v0.30.6
k8s.io/cri-api => k8s.io/cri-api v0.30.6
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.6
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.6
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.6
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.6
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.6
k8s.io/kubectl => k8s.io/kubectl v0.30.6
k8s.io/kubelet => k8s.io/kubelet v0.30.6
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.6
k8s.io/metrics => k8s.io/metrics v0.30.6
k8s.io/mount-utils => k8s.io/mount-utils v0.30.6
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.6
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.6
k8s.io/api => k8s.io/api v0.31.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.2
k8s.io/apimachinery => k8s.io/apimachinery v0.31.2
k8s.io/apiserver => k8s.io/apiserver v0.31.2
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.2
k8s.io/client-go => k8s.io/client-go v0.31.2
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.2
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.2
k8s.io/code-generator => k8s.io/code-generator v0.31.2
k8s.io/component-base => k8s.io/component-base v0.31.2
k8s.io/component-helpers => k8s.io/component-helpers v0.31.2
k8s.io/controller-manager => k8s.io/controller-manager v0.31.2
k8s.io/cri-api => k8s.io/cri-api v0.31.2
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.2
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.2
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.2
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.2
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.2
k8s.io/kubectl => k8s.io/kubectl v0.31.2
k8s.io/kubelet => k8s.io/kubelet v0.31.2
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.2
k8s.io/metrics => k8s.io/metrics v0.31.2
k8s.io/mount-utils => k8s.io/mount-utils v0.31.2
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.2
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.2
)
Loading

0 comments on commit 1752344

Please sign in to comment.