From b2157876f414907f1b3523063ddd2fad41a1f3c8 Mon Sep 17 00:00:00 2001 From: kpango Date: Thu, 19 Dec 2024 14:24:14 +0900 Subject: [PATCH 1/2] fix Signed-off-by: kpango --- hack/go.mod.default | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/hack/go.mod.default b/hack/go.mod.default index b5633e8622..6f0efae9f1 100644 --- a/hack/go.mod.default +++ b/hack/go.mod.default @@ -13,7 +13,7 @@ replace ( cloud.google.com/go/monitoring => cloud.google.com/go/monitoring upgrade cloud.google.com/go/pubsub => cloud.google.com/go/pubsub upgrade cloud.google.com/go/secretmanager => cloud.google.com/go/secretmanager upgrade - cloud.google.com/go/storage => cloud.google.com/go/storage upgrade + cloud.google.com/go/storage => cloud.google.com/go/storage v1.48.0 cloud.google.com/go/trace => cloud.google.com/go/trace upgrade code.cloudfoundry.org/bytefmt => code.cloudfoundry.org/bytefmt upgrade contrib.go.opencensus.io/exporter/aws => contrib.go.opencensus.io/exporter/aws upgrade @@ -329,21 +329,21 @@ replace ( gopkg.in/yaml.v2 => gopkg.in/yaml.v2 upgrade gopkg.in/yaml.v3 => gopkg.in/yaml.v3 upgrade honnef.co/go/tools => honnef.co/go/tools upgrade - 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/cli-runtime => k8s.io/cli-runtime v0.31.2 - k8s.io/client-go => k8s.io/client-go v0.31.2 - k8s.io/component-base => k8s.io/component-base v0.31.2 + k8s.io/api => k8s.io/api v0.32.0 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.0 + k8s.io/apimachinery => k8s.io/apimachinery v0.32.0 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.0 + k8s.io/client-go => k8s.io/client-go v0.32.0 + k8s.io/component-base => k8s.io/component-base v0.32.0 k8s.io/klog/v2 => k8s.io/klog/v2 upgrade k8s.io/kube-openapi => k8s.io/kube-openapi master - k8s.io/kubernetes => k8s.io/kubernetes v0.31.2 - k8s.io/metrics => k8s.io/metrics v0.31.2 + k8s.io/kubernetes => k8s.io/kubernetes v0.32.0 + k8s.io/metrics => k8s.io/metrics v0.32.0 nhooyr.io/websocket => nhooyr.io/websocket upgrade rsc.io/pdf => rsc.io/pdf upgrade - sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.19.1 + sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.19.3 sigs.k8s.io/json => sigs.k8s.io/json upgrade sigs.k8s.io/kustomize => sigs.k8s.io/kustomize upgrade - sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.4.1 + sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.5.0 sigs.k8s.io/yaml => sigs.k8s.io/yaml upgrade ) From bdc2d7d1053b4d32057730436e827b33449bc787 Mon Sep 17 00:00:00 2001 From: kpango Date: Thu, 19 Dec 2024 14:44:18 +0900 Subject: [PATCH 2/2] fix Signed-off-by: kpango --- Makefile.d/dependencies.mk | 1 + hack/go.mod.default | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.d/dependencies.mk b/Makefile.d/dependencies.mk index 441bbf90ff..ea3fc7e0d3 100644 --- a/Makefile.d/dependencies.mk +++ b/Makefile.d/dependencies.mk @@ -53,6 +53,7 @@ go/download: ## install Go package dependencies go/deps: \ update/go + head -n -1 $(ROOTDIR)/hack/go.mod.default | awk 'NR>=6 && $$0 !~ /(upgrade|latest|master|main)/' | sort sed -i "3s/go [0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?/go $(GO_VERSION)/g" $(ROOTDIR)/hack/go.mod.default if $(GO_CLEAN_DEPS); then \ rm -rf $(ROOTDIR)/vendor \ diff --git a/hack/go.mod.default b/hack/go.mod.default index 6f0efae9f1..c5d3e480a5 100644 --- a/hack/go.mod.default +++ b/hack/go.mod.default @@ -13,7 +13,7 @@ replace ( cloud.google.com/go/monitoring => cloud.google.com/go/monitoring upgrade cloud.google.com/go/pubsub => cloud.google.com/go/pubsub upgrade cloud.google.com/go/secretmanager => cloud.google.com/go/secretmanager upgrade - cloud.google.com/go/storage => cloud.google.com/go/storage v1.48.0 + cloud.google.com/go/storage => cloud.google.com/go/storage v1.47.0 cloud.google.com/go/trace => cloud.google.com/go/trace upgrade code.cloudfoundry.org/bytefmt => code.cloudfoundry.org/bytefmt upgrade contrib.go.opencensus.io/exporter/aws => contrib.go.opencensus.io/exporter/aws upgrade