From 3be1109829d4b0921972bb8b5f66a4d179ff6255 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Thu, 17 Oct 2024 15:51:15 -0400 Subject: [PATCH] Drop self-referencing replace directives --- hack/update-vendor.sh | 4 ++-- staging/src/k8s.io/api/go.mod | 5 +---- staging/src/k8s.io/apiextensions-apiserver/go.mod | 1 - staging/src/k8s.io/apimachinery/go.mod | 2 -- staging/src/k8s.io/apiserver/go.mod | 1 - staging/src/k8s.io/cli-runtime/go.mod | 1 - staging/src/k8s.io/client-go/go.mod | 1 - staging/src/k8s.io/cloud-provider/go.mod | 1 - staging/src/k8s.io/cluster-bootstrap/go.mod | 1 - staging/src/k8s.io/code-generator/go.mod | 5 +---- staging/src/k8s.io/component-base/go.mod | 1 - staging/src/k8s.io/component-helpers/go.mod | 1 - staging/src/k8s.io/controller-manager/go.mod | 1 - staging/src/k8s.io/cri-api/go.mod | 2 -- staging/src/k8s.io/cri-client/go.mod | 1 - staging/src/k8s.io/csi-translation-lib/go.mod | 1 - staging/src/k8s.io/dynamic-resource-allocation/go.mod | 1 - staging/src/k8s.io/endpointslice/go.mod | 1 - staging/src/k8s.io/kms/go.mod | 2 -- staging/src/k8s.io/kube-aggregator/go.mod | 1 - staging/src/k8s.io/kube-controller-manager/go.mod | 1 - staging/src/k8s.io/kube-proxy/go.mod | 1 - staging/src/k8s.io/kube-scheduler/go.mod | 1 - staging/src/k8s.io/kubectl/go.mod | 1 - staging/src/k8s.io/kubelet/go.mod | 1 - staging/src/k8s.io/metrics/go.mod | 1 - staging/src/k8s.io/mount-utils/go.mod | 2 -- staging/src/k8s.io/pod-security-admission/go.mod | 1 - staging/src/k8s.io/sample-apiserver/go.mod | 1 - staging/src/k8s.io/sample-cli-plugin/go.mod | 1 - staging/src/k8s.io/sample-controller/go.mod | 1 - 31 files changed, 4 insertions(+), 42 deletions(-) diff --git a/hack/update-vendor.sh b/hack/update-vendor.sh index 312eb3c32d0..f260c92a453 100755 --- a/hack/update-vendor.sh +++ b/hack/update-vendor.sh @@ -251,7 +251,7 @@ for repo in $(kube::util::list_staging_repos); do # drop all unused replace directives comm -23 \ <(go mod edit -json | jq -r '.Replace[] | .Old.Path' | sort) \ - <(go list -m -json all | jq -r .Path | sort) | + <(go list -m -json all | jq -r 'select(.Main | not) | .Path' | sort) | while read -r X; do echo "-dropreplace=${X}"; done | xargs -L 100 go mod edit -fmt @@ -263,7 +263,7 @@ echo "=== pruning root" # drop unused replace directives other than to local paths comm -23 \ <(go mod edit -json | jq -r '.Replace[] | select(.New.Path | startswith("./") | not) | .Old.Path' | sort) \ - <(go list -m -json all | jq -r .Path | sort) | + <(go list -m -json all | jq -r 'select(.Main | not) | .Path' | sort) | while read -r X; do echo "-dropreplace=${X}"; done | xargs -L 100 go mod edit -fmt diff --git a/staging/src/k8s.io/api/go.mod b/staging/src/k8s.io/api/go.mod index b0eb34d6812..7cbd085b111 100644 --- a/staging/src/k8s.io/api/go.mod +++ b/staging/src/k8s.io/api/go.mod @@ -38,7 +38,4 @@ require ( sigs.k8s.io/yaml v1.4.0 // indirect ) -replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery -) +replace k8s.io/apimachinery => ../apimachinery diff --git a/staging/src/k8s.io/apiextensions-apiserver/go.mod b/staging/src/k8s.io/apiextensions-apiserver/go.mod index bc265fbd78a..594e339b8a2 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/go.mod +++ b/staging/src/k8s.io/apiextensions-apiserver/go.mod @@ -129,7 +129,6 @@ require ( replace ( k8s.io/api => ../api - k8s.io/apiextensions-apiserver => ../apiextensions-apiserver k8s.io/apimachinery => ../apimachinery k8s.io/apiserver => ../apiserver k8s.io/client-go => ../client-go diff --git a/staging/src/k8s.io/apimachinery/go.mod b/staging/src/k8s.io/apimachinery/go.mod index 3b73816dfab..b155a1f68f1 100644 --- a/staging/src/k8s.io/apimachinery/go.mod +++ b/staging/src/k8s.io/apimachinery/go.mod @@ -55,5 +55,3 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) - -replace k8s.io/apimachinery => ../apimachinery diff --git a/staging/src/k8s.io/apiserver/go.mod b/staging/src/k8s.io/apiserver/go.mod index 1fdb2c5d0d6..71633cdfd7c 100644 --- a/staging/src/k8s.io/apiserver/go.mod +++ b/staging/src/k8s.io/apiserver/go.mod @@ -128,7 +128,6 @@ require ( replace ( k8s.io/api => ../api k8s.io/apimachinery => ../apimachinery - k8s.io/apiserver => ../apiserver k8s.io/client-go => ../client-go k8s.io/component-base => ../component-base k8s.io/kms => ../kms diff --git a/staging/src/k8s.io/cli-runtime/go.mod b/staging/src/k8s.io/cli-runtime/go.mod index 991ca4b6581..32648617cba 100644 --- a/staging/src/k8s.io/cli-runtime/go.mod +++ b/staging/src/k8s.io/cli-runtime/go.mod @@ -75,6 +75,5 @@ require ( replace ( k8s.io/api => ../api k8s.io/apimachinery => ../apimachinery - k8s.io/cli-runtime => ../cli-runtime k8s.io/client-go => ../client-go ) diff --git a/staging/src/k8s.io/client-go/go.mod b/staging/src/k8s.io/client-go/go.mod index 8a8c174bece..0c3773cd656 100644 --- a/staging/src/k8s.io/client-go/go.mod +++ b/staging/src/k8s.io/client-go/go.mod @@ -70,5 +70,4 @@ require ( replace ( k8s.io/api => ../api k8s.io/apimachinery => ../apimachinery - k8s.io/client-go => ../client-go ) diff --git a/staging/src/k8s.io/cloud-provider/go.mod b/staging/src/k8s.io/cloud-provider/go.mod index 51cd294a92f..1782a43e6f2 100644 --- a/staging/src/k8s.io/cloud-provider/go.mod +++ b/staging/src/k8s.io/cloud-provider/go.mod @@ -114,7 +114,6 @@ replace ( k8s.io/apimachinery => ../apimachinery k8s.io/apiserver => ../apiserver k8s.io/client-go => ../client-go - k8s.io/cloud-provider => ../cloud-provider k8s.io/component-base => ../component-base k8s.io/component-helpers => ../component-helpers k8s.io/controller-manager => ../controller-manager diff --git a/staging/src/k8s.io/cluster-bootstrap/go.mod b/staging/src/k8s.io/cluster-bootstrap/go.mod index 35f9440fe9d..2f016338ddd 100644 --- a/staging/src/k8s.io/cluster-bootstrap/go.mod +++ b/staging/src/k8s.io/cluster-bootstrap/go.mod @@ -40,5 +40,4 @@ require ( replace ( k8s.io/api => ../api k8s.io/apimachinery => ../apimachinery - k8s.io/cluster-bootstrap => ../cluster-bootstrap ) diff --git a/staging/src/k8s.io/code-generator/go.mod b/staging/src/k8s.io/code-generator/go.mod index a8a8217d5df..e585b078ee2 100644 --- a/staging/src/k8s.io/code-generator/go.mod +++ b/staging/src/k8s.io/code-generator/go.mod @@ -45,7 +45,4 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) -replace ( - k8s.io/apimachinery => ../apimachinery - k8s.io/code-generator => ../code-generator -) +replace k8s.io/apimachinery => ../apimachinery diff --git a/staging/src/k8s.io/component-base/go.mod b/staging/src/k8s.io/component-base/go.mod index 87f96a6b0aa..9f9a5c219f2 100644 --- a/staging/src/k8s.io/component-base/go.mod +++ b/staging/src/k8s.io/component-base/go.mod @@ -87,5 +87,4 @@ replace ( k8s.io/api => ../api k8s.io/apimachinery => ../apimachinery k8s.io/client-go => ../client-go - k8s.io/component-base => ../component-base ) diff --git a/staging/src/k8s.io/component-helpers/go.mod b/staging/src/k8s.io/component-helpers/go.mod index 8f5aba5c335..5c7e654beee 100644 --- a/staging/src/k8s.io/component-helpers/go.mod +++ b/staging/src/k8s.io/component-helpers/go.mod @@ -59,5 +59,4 @@ replace ( k8s.io/api => ../api k8s.io/apimachinery => ../apimachinery k8s.io/client-go => ../client-go - k8s.io/component-helpers => ../component-helpers ) diff --git a/staging/src/k8s.io/controller-manager/go.mod b/staging/src/k8s.io/controller-manager/go.mod index 424f31f959f..91e46c99eb0 100644 --- a/staging/src/k8s.io/controller-manager/go.mod +++ b/staging/src/k8s.io/controller-manager/go.mod @@ -108,6 +108,5 @@ replace ( k8s.io/apiserver => ../apiserver k8s.io/client-go => ../client-go k8s.io/component-base => ../component-base - k8s.io/controller-manager => ../controller-manager k8s.io/kms => ../kms ) diff --git a/staging/src/k8s.io/cri-api/go.mod b/staging/src/k8s.io/cri-api/go.mod index 049d18c16d7..64aee12f011 100644 --- a/staging/src/k8s.io/cri-api/go.mod +++ b/staging/src/k8s.io/cri-api/go.mod @@ -25,5 +25,3 @@ require ( gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) - -replace k8s.io/cri-api => ../cri-api diff --git a/staging/src/k8s.io/cri-client/go.mod b/staging/src/k8s.io/cri-client/go.mod index 58ba4ca6df2..d2e08878f54 100644 --- a/staging/src/k8s.io/cri-client/go.mod +++ b/staging/src/k8s.io/cri-client/go.mod @@ -85,5 +85,4 @@ replace ( k8s.io/client-go => ../client-go k8s.io/component-base => ../component-base k8s.io/cri-api => ../cri-api - k8s.io/cri-client => ../cri-client ) diff --git a/staging/src/k8s.io/csi-translation-lib/go.mod b/staging/src/k8s.io/csi-translation-lib/go.mod index 2965cc6a120..67237078e5e 100644 --- a/staging/src/k8s.io/csi-translation-lib/go.mod +++ b/staging/src/k8s.io/csi-translation-lib/go.mod @@ -39,5 +39,4 @@ require ( replace ( k8s.io/api => ../api k8s.io/apimachinery => ../apimachinery - k8s.io/csi-translation-lib => ../csi-translation-lib ) diff --git a/staging/src/k8s.io/dynamic-resource-allocation/go.mod b/staging/src/k8s.io/dynamic-resource-allocation/go.mod index f0de94c223a..dd478d9c1ee 100644 --- a/staging/src/k8s.io/dynamic-resource-allocation/go.mod +++ b/staging/src/k8s.io/dynamic-resource-allocation/go.mod @@ -90,7 +90,6 @@ replace ( k8s.io/component-base => ../component-base k8s.io/component-helpers => ../component-helpers k8s.io/cri-api => ../cri-api - k8s.io/dynamic-resource-allocation => ../dynamic-resource-allocation k8s.io/kms => ../kms k8s.io/kubelet => ../kubelet ) diff --git a/staging/src/k8s.io/endpointslice/go.mod b/staging/src/k8s.io/endpointslice/go.mod index 10a990f9cb6..12b229d92d6 100644 --- a/staging/src/k8s.io/endpointslice/go.mod +++ b/staging/src/k8s.io/endpointslice/go.mod @@ -72,5 +72,4 @@ replace ( k8s.io/apimachinery => ../apimachinery k8s.io/client-go => ../client-go k8s.io/component-base => ../component-base - k8s.io/endpointslice => ../endpointslice ) diff --git a/staging/src/k8s.io/kms/go.mod b/staging/src/k8s.io/kms/go.mod index f888f0cc9cf..0d88bc13e57 100644 --- a/staging/src/k8s.io/kms/go.mod +++ b/staging/src/k8s.io/kms/go.mod @@ -18,5 +18,3 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/protobuf v1.34.2 // indirect ) - -replace k8s.io/kms => ../kms diff --git a/staging/src/k8s.io/kube-aggregator/go.mod b/staging/src/k8s.io/kube-aggregator/go.mod index b10a1a340fa..3ac706153c7 100644 --- a/staging/src/k8s.io/kube-aggregator/go.mod +++ b/staging/src/k8s.io/kube-aggregator/go.mod @@ -119,5 +119,4 @@ replace ( k8s.io/code-generator => ../code-generator k8s.io/component-base => ../component-base k8s.io/kms => ../kms - k8s.io/kube-aggregator => ../kube-aggregator ) diff --git a/staging/src/k8s.io/kube-controller-manager/go.mod b/staging/src/k8s.io/kube-controller-manager/go.mod index df3f544e5d3..d993e0db3de 100644 --- a/staging/src/k8s.io/kube-controller-manager/go.mod +++ b/staging/src/k8s.io/kube-controller-manager/go.mod @@ -45,5 +45,4 @@ replace ( k8s.io/component-helpers => ../component-helpers k8s.io/controller-manager => ../controller-manager k8s.io/kms => ../kms - k8s.io/kube-controller-manager => ../kube-controller-manager ) diff --git a/staging/src/k8s.io/kube-proxy/go.mod b/staging/src/k8s.io/kube-proxy/go.mod index 6cc0bf0fe06..7ce6b35b77e 100644 --- a/staging/src/k8s.io/kube-proxy/go.mod +++ b/staging/src/k8s.io/kube-proxy/go.mod @@ -54,5 +54,4 @@ replace ( k8s.io/apimachinery => ../apimachinery k8s.io/client-go => ../client-go k8s.io/component-base => ../component-base - k8s.io/kube-proxy => ../kube-proxy ) diff --git a/staging/src/k8s.io/kube-scheduler/go.mod b/staging/src/k8s.io/kube-scheduler/go.mod index 51e9ba3943a..a5358420110 100644 --- a/staging/src/k8s.io/kube-scheduler/go.mod +++ b/staging/src/k8s.io/kube-scheduler/go.mod @@ -39,5 +39,4 @@ replace ( k8s.io/apimachinery => ../apimachinery k8s.io/client-go => ../client-go k8s.io/component-base => ../component-base - k8s.io/kube-scheduler => ../kube-scheduler ) diff --git a/staging/src/k8s.io/kubectl/go.mod b/staging/src/k8s.io/kubectl/go.mod index e9418867ca8..55c3630371d 100644 --- a/staging/src/k8s.io/kubectl/go.mod +++ b/staging/src/k8s.io/kubectl/go.mod @@ -104,6 +104,5 @@ replace ( k8s.io/code-generator => ../code-generator k8s.io/component-base => ../component-base k8s.io/component-helpers => ../component-helpers - k8s.io/kubectl => ../kubectl k8s.io/metrics => ../metrics ) diff --git a/staging/src/k8s.io/kubelet/go.mod b/staging/src/k8s.io/kubelet/go.mod index efdba6d51a3..a25e8054817 100644 --- a/staging/src/k8s.io/kubelet/go.mod +++ b/staging/src/k8s.io/kubelet/go.mod @@ -73,5 +73,4 @@ replace ( k8s.io/component-base => ../component-base k8s.io/cri-api => ../cri-api k8s.io/kms => ../kms - k8s.io/kubelet => ../kubelet ) diff --git a/staging/src/k8s.io/metrics/go.mod b/staging/src/k8s.io/metrics/go.mod index d7c86b058dd..677ba879e4f 100644 --- a/staging/src/k8s.io/metrics/go.mod +++ b/staging/src/k8s.io/metrics/go.mod @@ -66,5 +66,4 @@ replace ( k8s.io/apimachinery => ../apimachinery k8s.io/client-go => ../client-go k8s.io/code-generator => ../code-generator - k8s.io/metrics => ../metrics ) diff --git a/staging/src/k8s.io/mount-utils/go.mod b/staging/src/k8s.io/mount-utils/go.mod index e11bb975b3f..e274767cb0f 100644 --- a/staging/src/k8s.io/mount-utils/go.mod +++ b/staging/src/k8s.io/mount-utils/go.mod @@ -29,5 +29,3 @@ require ( gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) - -replace k8s.io/mount-utils => ../mount-utils diff --git a/staging/src/k8s.io/pod-security-admission/go.mod b/staging/src/k8s.io/pod-security-admission/go.mod index 692bdd8c03c..0b2d9568b36 100644 --- a/staging/src/k8s.io/pod-security-admission/go.mod +++ b/staging/src/k8s.io/pod-security-admission/go.mod @@ -112,5 +112,4 @@ replace ( k8s.io/client-go => ../client-go k8s.io/component-base => ../component-base k8s.io/kms => ../kms - k8s.io/pod-security-admission => ../pod-security-admission ) diff --git a/staging/src/k8s.io/sample-apiserver/go.mod b/staging/src/k8s.io/sample-apiserver/go.mod index ed307d63460..aae928ebd14 100644 --- a/staging/src/k8s.io/sample-apiserver/go.mod +++ b/staging/src/k8s.io/sample-apiserver/go.mod @@ -116,5 +116,4 @@ replace ( k8s.io/code-generator => ../code-generator k8s.io/component-base => ../component-base k8s.io/kms => ../kms - k8s.io/sample-apiserver => ../sample-apiserver ) diff --git a/staging/src/k8s.io/sample-cli-plugin/go.mod b/staging/src/k8s.io/sample-cli-plugin/go.mod index 8cf810ba68e..8a9898b9798 100644 --- a/staging/src/k8s.io/sample-cli-plugin/go.mod +++ b/staging/src/k8s.io/sample-cli-plugin/go.mod @@ -76,5 +76,4 @@ replace ( k8s.io/apimachinery => ../apimachinery k8s.io/cli-runtime => ../cli-runtime k8s.io/client-go => ../client-go - k8s.io/sample-cli-plugin => ../sample-cli-plugin ) diff --git a/staging/src/k8s.io/sample-controller/go.mod b/staging/src/k8s.io/sample-controller/go.mod index c28f6496593..15d1e915ab8 100644 --- a/staging/src/k8s.io/sample-controller/go.mod +++ b/staging/src/k8s.io/sample-controller/go.mod @@ -65,5 +65,4 @@ replace ( k8s.io/apimachinery => ../apimachinery k8s.io/client-go => ../client-go k8s.io/code-generator => ../code-generator - k8s.io/sample-controller => ../sample-controller )