Skip to content

Commit

Permalink
upgrade k8s deps 1.30
Browse files Browse the repository at this point in the history
Signed-off-by: Abner-1 <[email protected]>
  • Loading branch information
ABNER-1 committed Jan 24, 2025
1 parent c393385 commit 1daccea
Show file tree
Hide file tree
Showing 81 changed files with 645 additions and 589 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ GOOS ?= $(shell go env GOOS)

# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
# Run `setup-envtest list` to list available versions.
ENVTEST_K8S_VERSION ?= 1.28.0
ENVTEST_K8S_VERSION ?= 1.30.0

# Setting SHELL to bash allows bash commands to be executed by recipes.
# This is a requirement for 'setup-envtest.sh' in the test target.
Expand All @@ -28,7 +28,7 @@ all: build
##@ Development

go_check:
@scripts/check_go_version "1.20"
@scripts/check_go_version "1.22"

generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
@scripts/generate_client.sh
Expand Down Expand Up @@ -99,11 +99,11 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
controller-gen: ## Download controller-gen locally if necessary.

# controller-gen@v0.14.0 comply with k8s.io/api v0.28.x
ifeq ("$(shell $(CONTROLLER_GEN) --version 2> /dev/null)", "Version: v0.14.0")
# controller-gen@v0.16.5 comply with k8s.io/api v0.30.x
ifeq ("$(shell $(CONTROLLER_GEN) --version 2> /dev/null)", "Version: v0.16.5")
else
rm -rf $(CONTROLLER_GEN)
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.5)
endif
KUSTOMIZE = $(shell pwd)/bin/kustomize
kustomize: ## Download kustomize locally if necessary.
Expand Down
111 changes: 63 additions & 48 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/openkruise/kruise

go 1.20
go 1.22.0

require (
github.com/appscode/jsonpatch v1.0.1
Expand All @@ -18,48 +18,52 @@ require (
golang.org/x/time v0.3.0
gomodules.xyz/jsonpatch/v2 v2.4.0
google.golang.org/grpc v1.63.0
k8s.io/api v0.28.9
k8s.io/apiextensions-apiserver v0.28.9
k8s.io/apimachinery v0.28.9
k8s.io/apiserver v0.28.9
k8s.io/client-go v0.28.9
k8s.io/code-generator v0.28.9
k8s.io/component-base v0.28.9
k8s.io/component-helpers v0.28.9
k8s.io/cri-api v0.28.9
k8s.io/api v0.30.8
k8s.io/apiextensions-apiserver v0.30.8
k8s.io/apimachinery v0.30.8
k8s.io/apiserver v0.30.8
k8s.io/client-go v0.30.8
k8s.io/code-generator v0.30.8
k8s.io/component-base v0.30.8
k8s.io/component-helpers v0.30.8
k8s.io/cri-api v0.30.8
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01
k8s.io/klog/v2 v2.120.1
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
k8s.io/kubelet v0.28.9
k8s.io/kubernetes v1.28.9
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
k8s.io/kubelet v0.30.8
k8s.io/kubernetes v1.30.8
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
sigs.k8s.io/controller-runtime v0.16.6
sigs.k8s.io/controller-runtime v0.18.6
)

require (
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/go-logr/zapr v1.2.4 // indirect
github.com/google/cel-go v0.16.1 // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/google/cel-go v0.17.8 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.25.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 // indirect
golang.org/x/net v0.24.0 // indirect
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
k8s.io/controller-manager v0.28.9 // indirect
k8s.io/kms v0.28.9 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
k8s.io/controller-manager v0.30.8 // indirect
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
k8s.io/kms v0.30.8 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
)

require (
Expand All @@ -72,9 +76,9 @@ require (
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
Expand Down Expand Up @@ -104,7 +108,7 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
Expand All @@ -130,33 +134,44 @@ require (
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/cloud-provider v0.28.9 // indirect
k8s.io/csi-translation-lib v0.28.9 // indirect
k8s.io/dynamic-resource-allocation v0.28.9 // indirect
k8s.io/kube-scheduler v0.28.9 // indirect
k8s.io/mount-utils v0.28.9 // indirect
k8s.io/cloud-provider v0.30.8 // indirect
k8s.io/csi-translation-lib v0.30.8 // indirect
k8s.io/dynamic-resource-allocation v0.30.8 // indirect
k8s.io/kube-scheduler v0.30.8 // indirect
k8s.io/mount-utils v0.30.8 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace (
golang.org/x/sys => golang.org/x/sys v0.19.0
k8s.io/api => k8s.io/api v0.28.9
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.9
k8s.io/apimachinery => k8s.io/apimachinery v0.28.9
k8s.io/apiserver => k8s.io/apiserver v0.28.9
k8s.io/client-go => k8s.io/client-go v0.28.9
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.9
k8s.io/code-generator => k8s.io/code-generator v0.28.9
k8s.io/component-base => k8s.io/component-base v0.28.9
k8s.io/component-helpers => k8s.io/component-helpers v0.28.9
k8s.io/controller-manager => k8s.io/controller-manager v0.28.9
k8s.io/cri-api => k8s.io/cri-api v0.28.9
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.9
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.9
k8s.io/kms => k8s.io/kms v0.28.9
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.9
k8s.io/kubelet => k8s.io/kubelet v0.28.9
k8s.io/mount-utils => k8s.io/mount-utils v0.28.9
k8s.io/api => k8s.io/api v0.30.8
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.8
k8s.io/apimachinery => k8s.io/apimachinery v0.30.8
k8s.io/apiserver => k8s.io/apiserver v0.30.8
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.8
k8s.io/client-go => k8s.io/client-go v0.30.8
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.8
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.8
k8s.io/code-generator => k8s.io/code-generator v0.30.8
k8s.io/component-base => k8s.io/component-base v0.30.8
k8s.io/component-helpers => k8s.io/component-helpers v0.30.8
k8s.io/controller-manager => k8s.io/controller-manager v0.30.8
k8s.io/cri-api => k8s.io/cri-api v0.30.8
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.8
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.8
k8s.io/endpointslice => k8s.io/endpointslice v0.30.8
k8s.io/kms => k8s.io/kms v0.30.8
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.8
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.8
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.8
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.8
k8s.io/kubectl => k8s.io/kubectl v0.30.8
k8s.io/kubelet => k8s.io/kubelet v0.30.8
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.8
k8s.io/metrics => k8s.io/metrics v0.30.8
k8s.io/mount-utils => k8s.io/mount-utils v0.30.8
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.8
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.8
)
Loading

0 comments on commit 1daccea

Please sign in to comment.