Skip to content

Commit 649261f

Browse files
committed
Fix test module dependency management
Remove k8s.io replace directives from test module to resolve version conflicts. The test module should not override k8s.io versions with replace directives as this creates conflicts between: - k8s.io/apimachinery v0.34.1 (required by dependencies) - Forced downgrade to v0.33.2 (via replace) - sigs.k8s.io/structured-merge-diff v4 vs v6 incompatibility By removing k8s.io replaces and keeping only the necessary ones (ginkgo and cluster-kube-apiserver-operator local replace), the test module can naturally resolve to compatible versions. This allows the CI build to succeed without vendoring in the test module.
1 parent 7f653c9 commit 649261f

File tree

2 files changed

+67
-90
lines changed

2 files changed

+67
-90
lines changed

test/extended/tests-extension/go.mod

Lines changed: 22 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,28 @@ require (
66
github.com/onsi/ginkgo/v2 v2.22.0
77
github.com/onsi/gomega v1.36.1
88
github.com/openshift-eng/openshift-tests-extension v0.0.0-20250804142706-7b3ab438a292
9-
github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee
9+
github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235
1010
github.com/openshift/cluster-kube-apiserver-operator v0.0.0-00010101000000-000000000000
11-
github.com/spf13/cobra v1.8.1
12-
k8s.io/api v0.33.2
13-
k8s.io/apimachinery v0.33.2
14-
k8s.io/client-go v0.33.2
11+
github.com/spf13/cobra v1.9.1
12+
k8s.io/api v0.34.1
13+
k8s.io/apimachinery v0.34.1
14+
k8s.io/client-go v0.34.1
1515
)
1616

1717
require (
18-
cel.dev/expr v0.19.1 // indirect
18+
cel.dev/expr v0.24.0 // indirect
1919
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
2020
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
21-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
22-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
21+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
22+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
2323
github.com/go-logr/logr v1.4.2 // indirect
2424
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2525
github.com/go-openapi/jsonreference v0.20.2 // indirect
2626
github.com/go-openapi/swag v0.23.0 // indirect
2727
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
2828
github.com/gogo/protobuf v1.3.2 // indirect
29-
github.com/google/cel-go v0.23.2 // indirect
30-
github.com/google/gnostic-models v0.6.9 // indirect
29+
github.com/google/cel-go v0.26.0 // indirect
30+
github.com/google/gnostic-models v0.7.0 // indirect
3131
github.com/google/go-cmp v0.7.0 // indirect
3232
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
3333
github.com/google/uuid v1.6.0 // indirect
@@ -36,16 +36,18 @@ require (
3636
github.com/json-iterator/go v1.1.12 // indirect
3737
github.com/mailru/easyjson v0.7.7 // indirect
3838
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
39-
github.com/modern-go/reflect2 v1.0.2 // indirect
39+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
4040
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
41-
github.com/openshift/api v0.0.0-20250710004639-926605d3338b // indirect
42-
github.com/openshift/library-go v0.0.0-20250922131550-42e91dd47fe3 // indirect
41+
github.com/openshift/api v0.0.0-20251015095338-264e80a2b6e7 // indirect
42+
github.com/openshift/library-go v0.0.0-20251015151611-6fc7a74b67c5 // indirect
4343
github.com/pkg/errors v0.9.1 // indirect
4444
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
45-
github.com/spf13/pflag v1.0.5 // indirect
45+
github.com/spf13/pflag v1.0.6 // indirect
4646
github.com/stoewer/go-strcase v1.3.0 // indirect
4747
github.com/stretchr/testify v1.10.0 // indirect
4848
github.com/x448/float16 v0.8.4 // indirect
49+
go.yaml.in/yaml/v2 v2.4.2 // indirect
50+
go.yaml.in/yaml/v3 v3.0.4 // indirect
4951
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
5052
golang.org/x/net v0.43.0 // indirect
5153
golang.org/x/oauth2 v0.27.0 // indirect
@@ -54,50 +56,22 @@ require (
5456
golang.org/x/text v0.29.0 // indirect
5557
golang.org/x/time v0.9.0 // indirect
5658
golang.org/x/tools v0.36.0 // indirect
57-
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
58-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
59+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
60+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
5961
google.golang.org/protobuf v1.36.5 // indirect
6062
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6163
gopkg.in/inf.v0 v0.9.1 // indirect
6264
gopkg.in/yaml.v3 v3.0.1 // indirect
6365
k8s.io/klog/v2 v2.130.1 // indirect
64-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
65-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
66+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
67+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
6668
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
6769
sigs.k8s.io/randfill v1.0.0 // indirect
68-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
69-
sigs.k8s.io/yaml v1.4.0 // indirect
70+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
71+
sigs.k8s.io/yaml v1.6.0 // indirect
7072
)
7173

7274
replace (
7375
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20250416174521-4eb003743b54
7476
github.com/openshift/cluster-kube-apiserver-operator => ../../..
75-
k8s.io/api => k8s.io/api v0.33.2
76-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.2
77-
k8s.io/apimachinery => k8s.io/apimachinery v0.33.2
78-
k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20250826152558-f29d97fb46ec
79-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.2
80-
k8s.io/client-go => k8s.io/client-go v0.33.2
81-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.2
82-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.2
83-
k8s.io/code-generator => k8s.io/code-generator v0.33.2
84-
k8s.io/component-base => k8s.io/component-base v0.33.2
85-
k8s.io/component-helpers => k8s.io/component-helpers v0.33.2
86-
k8s.io/controller-manager => k8s.io/controller-manager v0.33.2
87-
k8s.io/cri-api => k8s.io/cri-api v0.33.2
88-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.2
89-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.2
90-
k8s.io/endpointslice => k8s.io/endpointslice v0.33.2
91-
k8s.io/kms => k8s.io/kms v0.33.2
92-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.2
93-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.2
94-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.2
95-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.2
96-
k8s.io/kubectl => k8s.io/kubectl v0.33.2
97-
k8s.io/kubelet => k8s.io/kubelet v0.33.2
98-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.33.2
99-
k8s.io/metrics => k8s.io/metrics v0.33.2
100-
k8s.io/mount-utils => k8s.io/mount-utils v0.33.2
101-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.2
102-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.2
10377
)

0 commit comments

Comments
 (0)