github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-19 00:31:00 +00:00
Code Issues Projects Releases Wiki Activity

Drop self-referencing replace directives

Browse Source
This commit is contained in:
Jordan Liggitt 2024-10-17 15:51:15 -04:00
parent 632ed16e00
commit 3be1109829
No known key found for this signature in database
31 changed files with 4 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/update-vendor.sh
View File

@ -251,7 +251,7 @@ for repo in $(kube::util::list_staging_repos); do
# drop all unused replace directives # drop all unused replace directives
comm -23 \ comm -23 \
<(go mod edit -json | jq -r '.Replace[] | .Old.Path' | sort) \ <(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 | while read -r X; do echo "-dropreplace=${X}"; done |
xargs -L 100 go mod edit -fmt xargs -L 100 go mod edit -fmt
@ -263,7 +263,7 @@ echo "=== pruning root"
# drop unused replace directives other than to local paths # drop unused replace directives other than to local paths
comm -23 \ comm -23 \
<(go mod edit -json | jq -r '.Replace[] | select(.New.Path | startswith("./") | not) | .Old.Path' | sort) \ <(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 | while read -r X; do echo "-dropreplace=${X}"; done |
xargs -L 100 go mod edit -fmt xargs -L 100 go mod edit -fmt

5
staging/src/k8s.io/api/go.mod
View File

@ -38,7 +38,4 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect sigs.k8s.io/yaml v1.4.0 // indirect
) )
replace ( replace k8s.io/apimachinery => ../apimachinery
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
)

1
staging/src/k8s.io/apiextensions-apiserver/go.mod
View File

@ -129,7 +129,6 @@ require (
replace ( replace (
k8s.io/api => ../api k8s.io/api => ../api
k8s.io/apiextensions-apiserver => ../apiextensions-apiserver
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go k8s.io/client-go => ../client-go

2
staging/src/k8s.io/apimachinery/go.mod
View File

@ -55,5 +55,3 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect
) )
replace k8s.io/apimachinery => ../apimachinery

1
staging/src/k8s.io/apiserver/go.mod
View File

@ -128,7 +128,6 @@ require (
replace ( replace (
k8s.io/api => ../api k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base k8s.io/component-base => ../component-base
k8s.io/kms => ../kms k8s.io/kms => ../kms

1
staging/src/k8s.io/cli-runtime/go.mod
View File

@ -75,6 +75,5 @@ require (
replace ( replace (
k8s.io/api => ../api k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => ../apimachinery
k8s.io/cli-runtime => ../cli-runtime
k8s.io/client-go => ../client-go k8s.io/client-go => ../client-go
) )

1
staging/src/k8s.io/client-go/go.mod
View File

@ -70,5 +70,4 @@ require (
replace ( replace (
k8s.io/api => ../api k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
) )

1
staging/src/k8s.io/cloud-provider/go.mod
View File

@ -114,7 +114,6 @@ replace (
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go k8s.io/client-go => ../client-go
k8s.io/cloud-provider => ../cloud-provider
k8s.io/component-base => ../component-base k8s.io/component-base => ../component-base
k8s.io/component-helpers => ../component-helpers k8s.io/component-helpers => ../component-helpers
k8s.io/controller-manager => ../controller-manager k8s.io/controller-manager => ../controller-manager

1
staging/src/k8s.io/cluster-bootstrap/go.mod
View File

@ -40,5 +40,4 @@ require (
replace ( replace (
k8s.io/api => ../api k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => ../apimachinery
k8s.io/cluster-bootstrap => ../cluster-bootstrap
) )

5
staging/src/k8s.io/code-generator/go.mod
View File

@ -45,7 +45,4 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
) )
replace ( replace k8s.io/apimachinery => ../apimachinery
k8s.io/apimachinery => ../apimachinery
k8s.io/code-generator => ../code-generator
)

1
staging/src/k8s.io/component-base/go.mod
View File

@ -87,5 +87,4 @@ replace (
k8s.io/api => ../api k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
) )

1
staging/src/k8s.io/component-helpers/go.mod
View File

@ -59,5 +59,4 @@ replace (
k8s.io/api => ../api k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go k8s.io/client-go => ../client-go
k8s.io/component-helpers => ../component-helpers
) )

1
staging/src/k8s.io/controller-manager/go.mod
View File

@ -108,6 +108,5 @@ replace (
k8s.io/apiserver => ../apiserver k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base k8s.io/component-base => ../component-base
k8s.io/controller-manager => ../controller-manager
k8s.io/kms => ../kms k8s.io/kms => ../kms
) )

2
staging/src/k8s.io/cri-api/go.mod
View File

@ -25,5 +25,3 @@ require (
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect
) )
replace k8s.io/cri-api => ../cri-api

1
staging/src/k8s.io/cri-client/go.mod
View File

@ -85,5 +85,4 @@ replace (
k8s.io/client-go => ../client-go k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api k8s.io/cri-api => ../cri-api
k8s.io/cri-client => ../cri-client
) )

1
staging/src/k8s.io/csi-translation-lib/go.mod
View File

@ -39,5 +39,4 @@ require (
replace ( replace (
k8s.io/api => ../api k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => ../apimachinery
k8s.io/csi-translation-lib => ../csi-translation-lib
) )

1
staging/src/k8s.io/dynamic-resource-allocation/go.mod
View File

@ -90,7 +90,6 @@ replace (
k8s.io/component-base => ../component-base k8s.io/component-base => ../component-base
k8s.io/component-helpers => ../component-helpers k8s.io/component-helpers => ../component-helpers
k8s.io/cri-api => ../cri-api k8s.io/cri-api => ../cri-api
k8s.io/dynamic-resource-allocation => ../dynamic-resource-allocation
k8s.io/kms => ../kms k8s.io/kms => ../kms
k8s.io/kubelet => ../kubelet k8s.io/kubelet => ../kubelet
) )

1
staging/src/k8s.io/endpointslice/go.mod
View File

@ -72,5 +72,4 @@ replace (
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base k8s.io/component-base => ../component-base
k8s.io/endpointslice => ../endpointslice
) )

2
staging/src/k8s.io/kms/go.mod
View File

@ -18,5 +18,3 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/protobuf v1.34.2 // indirect google.golang.org/protobuf v1.34.2 // indirect
) )
replace k8s.io/kms => ../kms

1
staging/src/k8s.io/kube-aggregator/go.mod
View File

@ -119,5 +119,4 @@ replace (
k8s.io/code-generator => ../code-generator k8s.io/code-generator => ../code-generator
k8s.io/component-base => ../component-base k8s.io/component-base => ../component-base
k8s.io/kms => ../kms k8s.io/kms => ../kms
k8s.io/kube-aggregator => ../kube-aggregator
) )

1
staging/src/k8s.io/kube-controller-manager/go.mod
View File

@ -45,5 +45,4 @@ replace (
k8s.io/component-helpers => ../component-helpers k8s.io/component-helpers => ../component-helpers
k8s.io/controller-manager => ../controller-manager k8s.io/controller-manager => ../controller-manager
k8s.io/kms => ../kms k8s.io/kms => ../kms
k8s.io/kube-controller-manager => ../kube-controller-manager
) )

1
staging/src/k8s.io/kube-proxy/go.mod
View File

@ -54,5 +54,4 @@ replace (
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base k8s.io/component-base => ../component-base
k8s.io/kube-proxy => ../kube-proxy
) )

1
staging/src/k8s.io/kube-scheduler/go.mod
View File

@ -39,5 +39,4 @@ replace (
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base k8s.io/component-base => ../component-base
k8s.io/kube-scheduler => ../kube-scheduler
) )

1
staging/src/k8s.io/kubectl/go.mod
View File

@ -104,6 +104,5 @@ replace (
k8s.io/code-generator => ../code-generator k8s.io/code-generator => ../code-generator
k8s.io/component-base => ../component-base k8s.io/component-base => ../component-base
k8s.io/component-helpers => ../component-helpers k8s.io/component-helpers => ../component-helpers
k8s.io/kubectl => ../kubectl
k8s.io/metrics => ../metrics k8s.io/metrics => ../metrics
) )

1
staging/src/k8s.io/kubelet/go.mod
View File

@ -73,5 +73,4 @@ replace (
k8s.io/component-base => ../component-base k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api k8s.io/cri-api => ../cri-api
k8s.io/kms => ../kms k8s.io/kms => ../kms
k8s.io/kubelet => ../kubelet
) )

1
staging/src/k8s.io/metrics/go.mod
View File

@ -66,5 +66,4 @@ replace (
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator k8s.io/code-generator => ../code-generator
k8s.io/metrics => ../metrics
) )

2
staging/src/k8s.io/mount-utils/go.mod
View File

@ -29,5 +29,3 @@ require (
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect
) )
replace k8s.io/mount-utils => ../mount-utils

1
staging/src/k8s.io/pod-security-admission/go.mod
View File

@ -112,5 +112,4 @@ replace (
k8s.io/client-go => ../client-go k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base k8s.io/component-base => ../component-base
k8s.io/kms => ../kms k8s.io/kms => ../kms
k8s.io/pod-security-admission => ../pod-security-admission
) )

1
staging/src/k8s.io/sample-apiserver/go.mod
View File

@ -116,5 +116,4 @@ replace (
k8s.io/code-generator => ../code-generator k8s.io/code-generator => ../code-generator
k8s.io/component-base => ../component-base k8s.io/component-base => ../component-base
k8s.io/kms => ../kms k8s.io/kms => ../kms
k8s.io/sample-apiserver => ../sample-apiserver
) )

1
staging/src/k8s.io/sample-cli-plugin/go.mod
View File

@ -76,5 +76,4 @@ replace (
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => ../apimachinery
k8s.io/cli-runtime => ../cli-runtime k8s.io/cli-runtime => ../cli-runtime
k8s.io/client-go => ../client-go k8s.io/client-go => ../client-go
k8s.io/sample-cli-plugin => ../sample-cli-plugin
) )

1
staging/src/k8s.io/sample-controller/go.mod
View File

@ -65,5 +65,4 @@ replace (
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
) )