Merge pull request kubernetes#128165 from liggitt/prune-self-require

k8s-ci-robot · web-flow · commit a8fc7ae761c1 · 2024-10-18T03:53:11.000+01:00
Drop self-referencing replace directives
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 )

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,4 @@ require (`
`38`	`38`	`sigs.k8s.io/yaml v1.4.0 // indirect`
`39`	`39`	`)`
`40`	`40`
`41`		`-replace (`
`42`		`- k8s.io/api => ../api`
`43`		`- k8s.io/apimachinery => ../apimachinery`
`44`		`-)`
	`41`	`+replace k8s.io/apimachinery => ../apimachinery`
Original file line number	Diff line number	Diff line change
`@@ -55,5 +55,3 @@ require (`
`55`	`55`	`gopkg.in/yaml.v2 v2.4.0 // indirect`
`56`	`56`	`gopkg.in/yaml.v3 v3.0.1 // indirect`
`57`	`57`	`)`
`58`		`-`
`59`		`-replace k8s.io/apimachinery => ../apimachinery`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,5 @@ require (`
`75`	`75`	`replace (`
`76`	`76`	`k8s.io/api => ../api`
`77`	`77`	`k8s.io/apimachinery => ../apimachinery`
`78`		`- k8s.io/cli-runtime => ../cli-runtime`
`79`	`78`	`k8s.io/client-go => ../client-go`
`80`	`79`	`)`
Original file line number	Diff line number	Diff line change
`@@ -70,5 +70,4 @@ require (`
`70`	`70`	`replace (`
`71`	`71`	`k8s.io/api => ../api`
`72`	`72`	`k8s.io/apimachinery => ../apimachinery`
`73`		`- k8s.io/client-go => ../client-go`
`74`	`73`	`)`
Original file line number	Diff line number	Diff line change
`@@ -40,5 +40,4 @@ require (`
`40`	`40`	`replace (`
`41`	`41`	`k8s.io/api => ../api`
`42`	`42`	`k8s.io/apimachinery => ../apimachinery`
`43`		`- k8s.io/cluster-bootstrap => ../cluster-bootstrap`
`44`	`43`	`)`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,4 @@ require (`
`45`	`45`	`sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect`
`46`	`46`	`)`
`47`	`47`
`48`		`-replace (`
`49`		`- k8s.io/apimachinery => ../apimachinery`
`50`		`- k8s.io/code-generator => ../code-generator`
`51`		`-)`
	`48`	`+replace k8s.io/apimachinery => ../apimachinery`