Skip to content

Commit e26036b

Browse files
committed
move replaces up because they are important, much more important than indirect deps
On-behalf-of: @SAP [email protected]
1 parent 25d2a3e commit e26036b

File tree

5 files changed

+75
-75
lines changed

5 files changed

+75
-75
lines changed

go.mod

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,52 @@ require (
5151
sigs.k8s.io/yaml v1.6.0
5252
)
5353

54+
replace (
55+
k8s.io/api => github.com/kcp-dev/kubernetes/staging/src/k8s.io/api v0.0.0-20251209073509-71e0f2506325
56+
k8s.io/apiextensions-apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20251209073509-71e0f2506325
57+
k8s.io/apimachinery => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20251209073509-71e0f2506325
58+
k8s.io/apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20251209073509-71e0f2506325
59+
k8s.io/cli-runtime => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20251209073509-71e0f2506325
60+
k8s.io/client-go => github.com/kcp-dev/kubernetes/staging/src/k8s.io/client-go v0.0.0-20251209073509-71e0f2506325
61+
k8s.io/cloud-provider => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20251209073509-71e0f2506325
62+
k8s.io/cluster-bootstrap => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20251209073509-71e0f2506325
63+
k8s.io/code-generator => github.com/kcp-dev/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20251209073509-71e0f2506325
64+
k8s.io/component-base => github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-base v0.0.0-20251209073509-71e0f2506325
65+
k8s.io/component-helpers => github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20251209073509-71e0f2506325
66+
k8s.io/controller-manager => github.com/kcp-dev/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20251209073509-71e0f2506325
67+
k8s.io/cri-api => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20251209073509-71e0f2506325
68+
k8s.io/cri-client => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20251209073509-71e0f2506325
69+
k8s.io/csi-translation-lib => github.com/kcp-dev/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20251209073509-71e0f2506325
70+
k8s.io/dynamic-resource-allocation => github.com/kcp-dev/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20251209073509-71e0f2506325
71+
k8s.io/endpointslice => github.com/kcp-dev/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20251209073509-71e0f2506325
72+
k8s.io/externaljwt => github.com/kcp-dev/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20251209073509-71e0f2506325
73+
k8s.io/kms => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kms v0.0.0-20251209073509-71e0f2506325
74+
k8s.io/kube-aggregator => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20251209073509-71e0f2506325
75+
k8s.io/kube-controller-manager => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20251209073509-71e0f2506325
76+
k8s.io/kube-proxy => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20251209073509-71e0f2506325
77+
k8s.io/kube-scheduler => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20251209073509-71e0f2506325
78+
k8s.io/kubectl => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20251209073509-71e0f2506325
79+
k8s.io/kubelet => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20251209073509-71e0f2506325
80+
k8s.io/kubernetes => github.com/kcp-dev/kubernetes v0.0.0-20251209073509-71e0f2506325
81+
k8s.io/metrics => github.com/kcp-dev/kubernetes/staging/src/k8s.io/metrics v0.0.0-20251209073509-71e0f2506325
82+
k8s.io/mount-utils => github.com/kcp-dev/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20251209073509-71e0f2506325
83+
k8s.io/pod-security-admission => github.com/kcp-dev/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20251209073509-71e0f2506325
84+
k8s.io/sample-apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20251209073509-71e0f2506325
85+
k8s.io/sample-cli-plugin => github.com/kcp-dev/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20251209073509-71e0f2506325
86+
k8s.io/sample-controller => github.com/kcp-dev/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20251209073509-71e0f2506325
87+
)
88+
89+
replace (
90+
github.com/kcp-dev/apimachinery/v2 => ./staging/src/github.com/kcp-dev/apimachinery
91+
github.com/kcp-dev/client-go => ./staging/src/github.com/kcp-dev/client-go
92+
github.com/kcp-dev/code-generator/v3 => ./staging/src/github.com/kcp-dev/code-generator
93+
github.com/kcp-dev/sdk => ./staging/src/github.com/kcp-dev/sdk
94+
)
95+
96+
// This fork is required to use IgnoreCreatedBy. The PR to add this
97+
// feature is here: https://github.com/uber-go/goleak/pull/136
98+
replace go.uber.org/goleak => github.com/ntnn/goleak v1.2.2-0.20251003233619-cbb740da4265
99+
54100
require (
55101
cel.dev/expr v0.24.0 // indirect
56102
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
@@ -178,49 +224,3 @@ require (
178224
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
179225
sigs.k8s.io/randfill v1.0.0 // indirect
180226
)
181-
182-
replace (
183-
k8s.io/api => github.com/kcp-dev/kubernetes/staging/src/k8s.io/api v0.0.0-20251209073509-71e0f2506325
184-
k8s.io/apiextensions-apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20251209073509-71e0f2506325
185-
k8s.io/apimachinery => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20251209073509-71e0f2506325
186-
k8s.io/apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20251209073509-71e0f2506325
187-
k8s.io/cli-runtime => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20251209073509-71e0f2506325
188-
k8s.io/client-go => github.com/kcp-dev/kubernetes/staging/src/k8s.io/client-go v0.0.0-20251209073509-71e0f2506325
189-
k8s.io/cloud-provider => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20251209073509-71e0f2506325
190-
k8s.io/cluster-bootstrap => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20251209073509-71e0f2506325
191-
k8s.io/code-generator => github.com/kcp-dev/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20251209073509-71e0f2506325
192-
k8s.io/component-base => github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-base v0.0.0-20251209073509-71e0f2506325
193-
k8s.io/component-helpers => github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20251209073509-71e0f2506325
194-
k8s.io/controller-manager => github.com/kcp-dev/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20251209073509-71e0f2506325
195-
k8s.io/cri-api => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20251209073509-71e0f2506325
196-
k8s.io/cri-client => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20251209073509-71e0f2506325
197-
k8s.io/csi-translation-lib => github.com/kcp-dev/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20251209073509-71e0f2506325
198-
k8s.io/dynamic-resource-allocation => github.com/kcp-dev/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20251209073509-71e0f2506325
199-
k8s.io/endpointslice => github.com/kcp-dev/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20251209073509-71e0f2506325
200-
k8s.io/externaljwt => github.com/kcp-dev/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20251209073509-71e0f2506325
201-
k8s.io/kms => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kms v0.0.0-20251209073509-71e0f2506325
202-
k8s.io/kube-aggregator => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20251209073509-71e0f2506325
203-
k8s.io/kube-controller-manager => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20251209073509-71e0f2506325
204-
k8s.io/kube-proxy => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20251209073509-71e0f2506325
205-
k8s.io/kube-scheduler => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20251209073509-71e0f2506325
206-
k8s.io/kubectl => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20251209073509-71e0f2506325
207-
k8s.io/kubelet => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20251209073509-71e0f2506325
208-
k8s.io/kubernetes => github.com/kcp-dev/kubernetes v0.0.0-20251209073509-71e0f2506325
209-
k8s.io/metrics => github.com/kcp-dev/kubernetes/staging/src/k8s.io/metrics v0.0.0-20251209073509-71e0f2506325
210-
k8s.io/mount-utils => github.com/kcp-dev/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20251209073509-71e0f2506325
211-
k8s.io/pod-security-admission => github.com/kcp-dev/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20251209073509-71e0f2506325
212-
k8s.io/sample-apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20251209073509-71e0f2506325
213-
k8s.io/sample-cli-plugin => github.com/kcp-dev/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20251209073509-71e0f2506325
214-
k8s.io/sample-controller => github.com/kcp-dev/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20251209073509-71e0f2506325
215-
)
216-
217-
replace (
218-
github.com/kcp-dev/apimachinery/v2 => ./staging/src/github.com/kcp-dev/apimachinery
219-
github.com/kcp-dev/client-go => ./staging/src/github.com/kcp-dev/client-go
220-
github.com/kcp-dev/code-generator/v3 => ./staging/src/github.com/kcp-dev/code-generator
221-
github.com/kcp-dev/sdk => ./staging/src/github.com/kcp-dev/sdk
222-
)
223-
224-
// This fork is required to use IgnoreCreatedBy. The PR to add this
225-
// feature is here: https://github.com/uber-go/goleak/pull/136
226-
replace go.uber.org/goleak => github.com/ntnn/goleak v1.2.2-0.20251003233619-cbb740da4265

staging/src/github.com/kcp-dev/cli/go.mod

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,18 @@ require (
2121
k8s.io/klog/v2 v2.130.1
2222
)
2323

24+
replace (
25+
github.com/charmbracelet/colorprofile => github.com/charmbracelet/colorprofile v0.2.2
26+
github.com/charmbracelet/x/ansi => github.com/charmbracelet/x/ansi v0.8.0
27+
)
28+
29+
replace (
30+
github.com/kcp-dev/apimachinery/v2 => ../apimachinery
31+
github.com/kcp-dev/client-go => ../client-go
32+
github.com/kcp-dev/code-generator/v3 => ../code-generator
33+
github.com/kcp-dev/sdk => ../sdk
34+
)
35+
2436
require (
2537
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
2638
github.com/MakeNowJust/heredoc v1.0.0 // indirect
@@ -95,15 +107,3 @@ require (
95107
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
96108
sigs.k8s.io/yaml v1.6.0 // indirect
97109
)
98-
99-
replace (
100-
github.com/charmbracelet/colorprofile => github.com/charmbracelet/colorprofile v0.2.2
101-
github.com/charmbracelet/x/ansi => github.com/charmbracelet/x/ansi v0.8.0
102-
)
103-
104-
replace (
105-
github.com/kcp-dev/apimachinery/v2 => ../apimachinery
106-
github.com/kcp-dev/client-go => ../client-go
107-
github.com/kcp-dev/code-generator/v3 => ../code-generator
108-
github.com/kcp-dev/sdk => ../sdk
109-
)

staging/src/github.com/kcp-dev/client-go/go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ require (
1717
sigs.k8s.io/yaml v1.6.0
1818
)
1919

20+
replace (
21+
github.com/kcp-dev/apimachinery/v2 => ../apimachinery
22+
github.com/kcp-dev/code-generator/v3 => ../code-generator
23+
)
24+
2025
require (
2126
cel.dev/expr v0.24.0 // indirect
2227
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
@@ -92,8 +97,3 @@ require (
9297
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
9398
sigs.k8s.io/randfill v1.0.0 // indirect
9499
)
95-
96-
replace (
97-
github.com/kcp-dev/apimachinery/v2 => ../apimachinery
98-
github.com/kcp-dev/code-generator/v3 => ../code-generator
99-
)

staging/src/github.com/kcp-dev/code-generator/examples/go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ require (
1313
sigs.k8s.io/structured-merge-diff/v6 v6.3.0
1414
)
1515

16+
replace (
17+
github.com/kcp-dev/apimachinery/v2 => ../../apimachinery
18+
github.com/kcp-dev/client-go => ../../client-go
19+
github.com/kcp-dev/code-generator/v3 => ../../code-generator
20+
)
21+
1622
require (
1723
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
1824
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
@@ -54,9 +60,3 @@ require (
5460
sigs.k8s.io/randfill v1.0.0 // indirect
5561
sigs.k8s.io/yaml v1.6.0 // indirect
5662
)
57-
58-
replace (
59-
github.com/kcp-dev/apimachinery/v2 => ../../apimachinery
60-
github.com/kcp-dev/client-go => ../../client-go
61-
github.com/kcp-dev/code-generator/v3 => ../../code-generator
62-
)

staging/src/github.com/kcp-dev/sdk/go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ require (
3333
sigs.k8s.io/yaml v1.6.0
3434
)
3535

36+
replace (
37+
github.com/kcp-dev/apimachinery/v2 => ../apimachinery
38+
github.com/kcp-dev/client-go => ../client-go
39+
github.com/kcp-dev/code-generator/v3 => ../code-generator
40+
)
41+
3642
require (
3743
cel.dev/expr v0.24.0 // indirect
3844
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
@@ -115,9 +121,3 @@ require (
115121
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
116122
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
117123
)
118-
119-
replace (
120-
github.com/kcp-dev/apimachinery/v2 => ../apimachinery
121-
github.com/kcp-dev/client-go => ../client-go
122-
github.com/kcp-dev/code-generator/v3 => ../code-generator
123-
)

0 commit comments

Comments
 (0)