Skip to content

Commit e0d38d6

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 inconsistent vendoring errors in CI builds. Kept only essential replaces: - github.com/onsi/ginkgo/v2 → openshift fork - k8s.io/pod-security-admission → v0.33.3 (required as it has v0.0.0 default) This allows the test module to naturally resolve dependencies without vendor directory conflicts.
1 parent b10c75f commit e0d38d6

File tree

3 files changed

+4
-31
lines changed

3 files changed

+4
-31
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ verify:
6363
tests-ext-build:
6464
cd $(TESTS_EXT_DIR) && \
6565
GOOS=$(GOOS) GOARCH=$(GOARCH) GO_COMPLIANCE_POLICY=exempt_all CGO_ENABLED=0 \
66-
go build -o $(TESTS_EXT_BINARY) -ldflags "$(TESTS_EXT_LDFLAGS)" $(TESTS_EXT_PACKAGE)
66+
go build -mod=mod -o $(TESTS_EXT_BINARY) -ldflags "$(TESTS_EXT_LDFLAGS)" $(TESTS_EXT_PACKAGE)
6767

6868
# -------------------------------------------------------------------
6969
# Run "update" and strip env-specific metadata

test/extended/tests-extension/go.mod

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ require (
77
github.com/onsi/gomega v1.38.0
88
github.com/openshift-eng/openshift-tests-extension v0.0.0-20250804142706-7b3ab438a292
99
github.com/openshift/client-go v0.0.0-20250811163556-6193816ae379
10+
github.com/spf13/cobra v1.8.1
1011
k8s.io/api v0.33.3
1112
k8s.io/apimachinery v0.33.3
1213
k8s.io/client-go v0.33.3
@@ -50,7 +51,6 @@ require (
5051
github.com/prometheus/client_model v0.6.1 // indirect
5152
github.com/prometheus/common v0.62.0 // indirect
5253
github.com/prometheus/procfs v0.15.1 // indirect
53-
github.com/spf13/cobra v1.8.1 // indirect
5454
github.com/spf13/pflag v1.0.5 // indirect
5555
github.com/stoewer/go-strcase v1.3.0 // indirect
5656
github.com/x448/float16 v0.8.4 // indirect
@@ -84,32 +84,5 @@ require (
8484

8585
replace (
8686
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12
87-
k8s.io/api => k8s.io/api v0.33.3
88-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.3
89-
k8s.io/apimachinery => k8s.io/apimachinery v0.33.3
90-
k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20250917144435-182485d204aa
91-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.3
92-
k8s.io/client-go => k8s.io/client-go v0.33.3
93-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.3
94-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.3
95-
k8s.io/code-generator => k8s.io/code-generator v0.33.3
96-
k8s.io/component-base => k8s.io/component-base v0.33.3
97-
k8s.io/component-helpers => k8s.io/component-helpers v0.33.3
98-
k8s.io/controller-manager => k8s.io/controller-manager v0.33.3
99-
k8s.io/cri-api => k8s.io/cri-api v0.33.3
100-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.3
101-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.3
102-
k8s.io/endpointslice => k8s.io/endpointslice v0.33.3
103-
k8s.io/kms => k8s.io/kms v0.33.3
104-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.3
105-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.3
106-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.3
107-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.3
108-
k8s.io/kubectl => k8s.io/kubectl v0.33.3
109-
k8s.io/kubelet => k8s.io/kubelet v0.33.3
110-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.33.3
111-
k8s.io/metrics => k8s.io/metrics v0.33.3
112-
k8s.io/mount-utils => k8s.io/mount-utils v0.33.3
11387
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.3
114-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.3
11588
)

test/extended/tests-extension/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@ github.com/openshift/api v0.0.0-20250820105013-6282350d0c39 h1:X42iTyo3AAHS36Bki
9090
github.com/openshift/api v0.0.0-20250820105013-6282350d0c39/go.mod h1:SPLf21TYPipzCO67BURkCfK6dcIIxx0oNRVWaOyRcXM=
9191
github.com/openshift/client-go v0.0.0-20250811163556-6193816ae379 h1:Xr47DBqFVjpLdU4BTtCS5l2XojbRYap2FIPdSj8YYzU=
9292
github.com/openshift/client-go v0.0.0-20250811163556-6193816ae379/go.mod h1:HouQRy4JgvTBpxcyw1YSD/Lp+wjOaUrxjWFHlMtZsk8=
93-
github.com/openshift/kubernetes-apiserver v0.0.0-20250917144435-182485d204aa h1:rCAG+5H7TRJvPh0H05Lv3dE3SACVsO6Afm/auqjWnDo=
94-
github.com/openshift/kubernetes-apiserver v0.0.0-20250917144435-182485d204aa/go.mod h1:05632ifFEe6TxwjdAIrwINHWE2hLwyADFk5mBsQa15E=
9593
github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 h1:AKx/w1qpS8We43bsRgf8Nll3CGlDHpr/WAXvuedTNZI=
9694
github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
9795
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -202,6 +200,8 @@ k8s.io/api v0.33.3 h1:SRd5t//hhkI1buzxb288fy2xvjubstenEKL9K51KBI8=
202200
k8s.io/api v0.33.3/go.mod h1:01Y/iLUjNBM3TAvypct7DIj0M0NIZc+PzAHCIo0CYGE=
203201
k8s.io/apimachinery v0.33.3 h1:4ZSrmNa0c/ZpZJhAgRdcsFcZOw1PQU1bALVQ0B3I5LA=
204202
k8s.io/apimachinery v0.33.3/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
203+
k8s.io/apiserver v0.33.3 h1:Wv0hGc+QFdMJB4ZSiHrCgN3zL3QRatu56+rpccKC3J4=
204+
k8s.io/apiserver v0.33.3/go.mod h1:05632ifFEe6TxwjdAIrwINHWE2hLwyADFk5mBsQa15E=
205205
k8s.io/client-go v0.33.3 h1:M5AfDnKfYmVJif92ngN532gFqakcGi6RvaOF16efrpA=
206206
k8s.io/client-go v0.33.3/go.mod h1:luqKBQggEf3shbxHY4uVENAxrDISLOarxpTKMiUuujg=
207207
k8s.io/component-base v0.33.3 h1:mlAuyJqyPlKZM7FyaoM/LcunZaaY353RXiOd2+B5tGA=

0 commit comments

Comments
 (0)