Skip to content

Commit 4747d6c

Browse files
author
Per Goncalves da Silva
committed
OTE: Enable disconnected environment and build test operator controller image
Signed-off-by: Per Goncalves da Silva <[email protected]>
1 parent 83ffc35 commit 4747d6c

File tree

22 files changed

+970
-172
lines changed

22 files changed

+970
-172
lines changed

‎openshift/tests-extension/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
bin/
2+
!vendor/

‎openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,11 @@
130130
"environmentSelector": {}
131131
},
132132
{
133-
"name": "[sig-olmv1][OCPFeatureGate:NewOLM][Skipped:Disconnected] OLMv1 operator installation should block cluster upgrades if an incompatible operator is installed",
134-
"labels": {},
133+
"name": "[sig-olmv1][OCPFeatureGate:NewOLM] OLMv1 operator installation should block cluster upgrades if an incompatible operator is installed",
134+
"originalName": "[sig-olmv1][OCPFeatureGate:NewOLM][Skipped:Disconnected] OLMv1 operator installation should block cluster upgrades if an incompatible operator is installed",
135+
"labels": {
136+
"original-name:[sig-olmv1][OCPFeatureGate:NewOLM][Skipped:Disconnected] OLMv1 operator installation should block cluster upgrades if an incompatible operator is installed": {}
137+
},
135138
"resources": {
136139
"isolation": {}
137140
},

‎openshift/tests-extension/Makefile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ lint: $(GOLANGCI_LINT) #HELP Run golangci linter.
6464
fix-lint: $(GOLANGCI_LINT) #HELP Fix lint issues
6565
$(GOLANGCI_LINT) run --fix
6666

67-
# Bindata generation
6867
.PHONY: bindata
6968
bindata: $(GO_BINDATA)
7069

@@ -97,6 +96,11 @@ build: #HELP Build the extended tests binary
9796

9897
.PHONY: update-metadata
9998
update-metadata: #HELP Build and run 'update-metadata' to generate test metadata
99+
@# Check if KUBECONFIG is set and not empty
100+
@if [ -z "$(KUBECONFIG)" ]; then \
101+
echo "Please set KUBECONFIG first"; \
102+
exit 1; \
103+
fi
100104
$(TOOLS_BIN_DIR)/olmv1-tests-ext update --component openshift:payload:olmv1
101105
$(MAKE) clean-metadata
102106

‎openshift/tests-extension/go.mod‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ go 1.24.4
44

55
require (
66
github.com/blang/semver/v4 v4.0.0
7-
github.com/ghodss/yaml v1.0.0
7+
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
88
github.com/onsi/ginkgo/v2 v2.25.1
99
github.com/onsi/gomega v1.38.2
1010
github.com/openshift-eng/openshift-tests-extension v0.0.0-20250722101414-8083129ab8f9
1111
github.com/openshift/api v0.0.0-20250808142411-c974eeafe3f1
1212
github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee
13+
github.com/openshift/origin v1.5.0-alpha.3.0.20250927181537-6079513c8d63
1314
github.com/operator-framework/operator-controller v1.5.1
1415
github.com/pborman/uuid v1.2.1
1516
github.com/spf13/cobra v1.10.1
@@ -22,7 +23,7 @@ require (
2223
k8s.io/apiserver v0.33.4
2324
k8s.io/client-go v0.33.4
2425
k8s.io/kubernetes v1.33.4
25-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
26+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
2627
sigs.k8s.io/controller-runtime v0.21.0
2728
)
2829

@@ -99,7 +100,7 @@ require (
99100
github.com/tidwall/match v1.1.1 // indirect
100101
github.com/x448/float16 v0.8.4 // indirect
101102
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
102-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
103+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
103104
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
104105
go.opentelemetry.io/otel v1.37.0 // indirect
105106
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 // indirect
@@ -121,27 +122,27 @@ require (
121122
golang.org/x/time v0.12.0 // indirect
122123
golang.org/x/tools v0.36.0 // indirect
123124
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
124-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
125+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 // indirect
125126
google.golang.org/grpc v1.75.0 // indirect
126127
google.golang.org/protobuf v1.36.8 // indirect
127128
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
128129
gopkg.in/inf.v0 v0.9.1 // indirect
129130
gopkg.in/yaml.v2 v2.4.0 // indirect
130-
k8s.io/cloud-provider v0.0.0 // indirect
131+
k8s.io/cloud-provider v0.31.1 // indirect
131132
k8s.io/component-base v0.33.4 // indirect
132-
k8s.io/component-helpers v0.33.2 // indirect
133+
k8s.io/component-helpers v0.33.4 // indirect
133134
k8s.io/controller-manager v0.33.2 // indirect
134-
k8s.io/cri-api v0.0.0 // indirect
135+
k8s.io/cri-api v0.27.1 // indirect
135136
k8s.io/cri-client v0.0.0 // indirect
136137
k8s.io/csi-translation-lib v0.0.0 // indirect
137138
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
138139
k8s.io/klog/v2 v2.130.1 // indirect
139140
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
140141
k8s.io/kube-scheduler v0.0.0 // indirect
141-
k8s.io/kubectl v0.33.3 // indirect
142-
k8s.io/kubelet v0.0.0 // indirect
142+
k8s.io/kubectl v0.33.4 // indirect
143+
k8s.io/kubelet v0.31.1 // indirect
143144
k8s.io/mount-utils v0.0.0 // indirect
144-
k8s.io/pod-security-admission v0.0.0 // indirect
145+
k8s.io/pod-security-admission v0.33.4 // indirect
145146
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0 // indirect
146147
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
147148
sigs.k8s.io/randfill v1.0.0 // indirect

‎openshift/tests-extension/go.sum‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S
5757
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
5858
github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
5959
github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
60-
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
61-
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
60+
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ERFA1PUxfmGpolnw2v0bKOREu5ew=
61+
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
6262
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
6363
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
6464
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -201,6 +201,8 @@ github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0
201201
github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250906192346-6efb6a95323f/go.mod h1:+UmuDIUnxxGlHHQvFhdg4s1XMRX+MBU1n70IYo18IOk=
202202
github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20250416174521-4eb003743b54 h1:ehXndVZfIk/fo18YJCMJ+6b8HL8tzqjP7yWgchMnfCc=
203203
github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20250416174521-4eb003743b54/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
204+
github.com/openshift/origin v1.5.0-alpha.3.0.20250927181537-6079513c8d63 h1:kt7T98/AlpwFeMZlEqlwRJXWUW0kp9etoZ1uUmZfLnY=
205+
github.com/openshift/origin v1.5.0-alpha.3.0.20250927181537-6079513c8d63/go.mod h1:thiTAaYNKIS7Lh6Lvzwi1JcE/TrX8oSc8u8PfP/Gaa8=
204206
github.com/operator-framework/operator-controller v1.5.1 h1:J3xdRHzh9ajuKt/i1fWxoOLUf3kMpaOnGf1XNZ6+Klg=
205207
github.com/operator-framework/operator-controller v1.5.1/go.mod h1:6BpO9yzrmr1s7zqnk7YUA9SJlNVD+gA25JS5sg6axCE=
206208
github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw=
@@ -334,8 +336,8 @@ gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
334336
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
335337
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 h1:FiusG7LWj+4byqhbvmB+Q93B/mOxJLN2DTozDuZm4EU=
336338
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7/go.mod h1:kXqgZtrWaf6qS3jZOCnCH7WYfrvFjkC51bM8fz3RsCA=
337-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 h1:pFyd6EwwL2TqFf8emdthzeX+gZE1ElRq3iM8pui4KBY=
338-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
339+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 h1:MAKi5q709QWfnkkpNQ0M12hYJ1+e8qYVDyowc4U1XZM=
340+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
339341
google.golang.org/grpc v1.75.0 h1:+TW+dqTd2Biwe6KKfhE5JpiYIBWq865PhKGSXiivqt4=
340342
google.golang.org/grpc v1.75.0/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
341343
google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
@@ -347,6 +349,7 @@ gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSP
347349
gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
348350
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
349351
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
352+
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
350353
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
351354
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
352355
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -356,8 +359,8 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
356359
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
357360
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a h1:ZV3Zr+/7s7aVbjNGICQt+ppKWsF1tehxggNfbM7XnG8=
358361
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
359-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
360-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
362+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d h1:wAhiDyZ4Tdtt7e46e9M5ZSAJ/MnPGPs+Ki1gHw4w1R0=
363+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
361364
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0 h1:qPrZsv1cwQiFeieFlRqT627fVZ+tyfou/+S5S0H5ua0=
362365
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
363366
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=

‎openshift/tests-extension/pkg/bindata/catalog/catalog.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)