From 2513650658145f015ba6addde90cf556cb89cba7 Mon Sep 17 00:00:00 2001 From: Yusuke Kato Date: Thu, 19 Dec 2024 15:03:35 +0900 Subject: [PATCH] Added output for Go Module with fixed Version (#2784) * fix Signed-off-by: kpango * fix Signed-off-by: kpango --------- Signed-off-by: kpango Co-authored-by: Kiichiro YUKAWA --- Makefile.d/dependencies.mk | 1 + hack/go.mod.default | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) 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 1d9b7e4b88..c5d3e480a5 100644 --- a/hack/go.mod.default +++ b/hack/go.mod.default @@ -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 )