Skip to content

Commit 6292ce5

Browse files
stuggistuggi
committed
Bump dependencies for OpenShift 4.18 compatibility
Update controller-runtime, Kubernetes dependencies, and testing tools to support OpenShift Container Platform 4.18 (Kubernetes 1.31). Changes: - controller-runtime: v0.17.6 → v0.19.7 - Kubernetes core dependencies: v0.29.15 → v0.31.12 * k8s.io/api: v0.31.12 * k8s.io/apimachinery: v0.31.12 * k8s.io/client-go: v0.31.12 * k8s.io/apiextensions-apiserver: v0.31.12 - k8s.io/utils: v0.0.0-20240711033017 → v0.0.0-20250820121507 - controller-gen: v0.14.0 → v0.18.0 - envtest: 1.29 → 1.31, setup-envtest@latest Depends-On: openstack-k8s-operators/infra-operator#432 Signed-off-by: Martin Schuppert <[email protected]>
1 parent f804ccb commit 6292ce5

File tree

34 files changed

+1425
-693
lines changed

34 files changed

+1425
-693
lines changed

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ OPERATOR_SDK_VERSION ?= v1.31.0
5656
DEFAULT_IMG ?= quay.io/openstack-k8s-operators/openstack-operator:latest
5757
IMG ?= $(DEFAULT_IMG)
5858
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
59-
ENVTEST_K8S_VERSION = 1.29
59+
ENVTEST_K8S_VERSION = 1.31
6060

6161
CRDDESC_OVERRIDE ?= :maxDescLen=0
6262

@@ -310,7 +310,7 @@ KUTTL ?= $(LOCALBIN)/kubectl-kuttl
310310

311311
## Tool Versions
312312
KUSTOMIZE_VERSION ?= v5.5.0 #(dprince: bumped to aquire new features like --load-restrictor)
313-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
313+
CONTROLLER_TOOLS_VERSION ?= v0.18.0
314314
CRD_MARKDOWN_VERSION ?= v0.0.3
315315
KUTTL_VERSION ?= 0.17.0
316316
GOTOOLCHAIN_VERSION ?= go1.24.0
@@ -340,7 +340,7 @@ $(CRD_MARKDOWN): $(LOCALBIN)
340340
.PHONY: envtest
341341
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
342342
$(ENVTEST): $(LOCALBIN)
343-
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@c7e1dc9b
343+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
344344

345345
.PHONY: ginkgo
346346
ginkgo: $(GINKGO) ## Download ginkgo locally if necessary.

‎apis/bases/client.openstack.org_openstackclients.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: openstackclients.client.openstack.org
88
spec:
99
group: client.openstack.org
@@ -56,6 +56,7 @@ spec:
5656
key:
5757
type: string
5858
name:
59+
default: ""
5960
type: string
6061
optional:
6162
type: boolean
@@ -94,6 +95,7 @@ spec:
9495
key:
9596
type: string
9697
name:
98+
default: ""
9799
type: string
98100
optional:
99101
type: boolean

‎apis/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 384 additions & 1 deletion
Large diffs are not rendered by default.

‎apis/bases/core.openstack.org_openstackversions.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: openstackversions.core.openstack.org
88
spec:
99
group: core.openstack.org

‎apis/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: openstackdataplanedeployments.dataplane.openstack.org
88
spec:
99
group: dataplane.openstack.org

‎apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: openstackdataplanenodesets.dataplane.openstack.org
88
spec:
99
group: dataplane.openstack.org
@@ -163,6 +163,7 @@ spec:
163163
key:
164164
type: string
165165
name:
166+
default: ""
166167
type: string
167168
optional:
168169
type: boolean
@@ -201,6 +202,7 @@ spec:
201202
key:
202203
type: string
203204
name:
205+
default: ""
204206
type: string
205207
optional:
206208
type: boolean
@@ -274,6 +276,8 @@ spec:
274276
type: string
275277
readOnly:
276278
type: boolean
279+
recursiveReadOnly:
280+
type: string
277281
subPath:
278282
type: string
279283
subPathExpr:
@@ -296,6 +300,7 @@ spec:
296300
items:
297301
type: string
298302
type: array
303+
x-kubernetes-list-type: atomic
299304
path:
300305
type: string
301306
readOnly:
@@ -305,6 +310,7 @@ spec:
305310
secretRef:
306311
properties:
307312
name:
313+
default: ""
308314
type: string
309315
type: object
310316
x-kubernetes-map-type: atomic
@@ -333,7 +339,9 @@ spec:
333339
- path
334340
type: object
335341
type: array
342+
x-kubernetes-list-type: atomic
336343
name:
344+
default: ""
337345
type: string
338346
optional:
339347
type: boolean
@@ -348,6 +356,7 @@ spec:
348356
nodePublishSecretRef:
349357
properties:
350358
name:
359+
default: ""
351360
type: string
352361
type: object
353362
x-kubernetes-map-type: atomic
@@ -403,6 +412,7 @@ spec:
403412
- path
404413
type: object
405414
type: array
415+
x-kubernetes-list-type: atomic
406416
type: object
407417
emptyDir:
408418
properties:
@@ -428,10 +438,12 @@ spec:
428438
items:
429439
type: string
430440
type: array
441+
x-kubernetes-list-type: atomic
431442
wwids:
432443
items:
433444
type: string
434445
type: array
446+
x-kubernetes-list-type: atomic
435447
type: object
436448
hostPath:
437449
properties:
@@ -455,6 +467,7 @@ spec:
455467
iqn:
456468
type: string
457469
iscsiInterface:
470+
default: default
458471
type: string
459472
lun:
460473
format: int32
@@ -463,11 +476,13 @@ spec:
463476
items:
464477
type: string
465478
type: array
479+
x-kubernetes-list-type: atomic
466480
readOnly:
467481
type: boolean
468482
secretRef:
469483
properties:
470484
name:
485+
default: ""
471486
type: string
472487
type: object
473488
x-kubernetes-map-type: atomic
@@ -524,11 +539,13 @@ spec:
524539
items:
525540
type: string
526541
type: array
542+
x-kubernetes-list-type: atomic
527543
required:
528544
- key
529545
- operator
530546
type: object
531547
type: array
548+
x-kubernetes-list-type: atomic
532549
matchLabels:
533550
additionalProperties:
534551
type: string
@@ -563,7 +580,9 @@ spec:
563580
- path
564581
type: object
565582
type: array
583+
x-kubernetes-list-type: atomic
566584
name:
585+
default: ""
567586
type: string
568587
optional:
569588
type: boolean
@@ -609,6 +628,7 @@ spec:
609628
- path
610629
type: object
611630
type: array
631+
x-kubernetes-list-type: atomic
612632
type: object
613633
secret:
614634
properties:
@@ -627,7 +647,9 @@ spec:
627647
- path
628648
type: object
629649
type: array
650+
x-kubernetes-list-type: atomic
630651
name:
652+
default: ""
631653
type: string
632654
optional:
633655
type: boolean
@@ -647,10 +669,12 @@ spec:
647669
type: object
648670
type: object
649671
type: array
672+
x-kubernetes-list-type: atomic
650673
type: object
651674
scaleIO:
652675
properties:
653676
fsType:
677+
default: xfs
654678
type: string
655679
gateway:
656680
type: string
@@ -661,12 +685,14 @@ spec:
661685
secretRef:
662686
properties:
663687
name:
688+
default: ""
664689
type: string
665690
type: object
666691
x-kubernetes-map-type: atomic
667692
sslEnabled:
668693
type: boolean
669694
storageMode:
695+
default: ThinProvisioned
670696
type: string
671697
storagePool:
672698
type: string
@@ -699,6 +725,7 @@ spec:
699725
- path
700726
type: object
701727
type: array
728+
x-kubernetes-list-type: atomic
702729
optional:
703730
type: boolean
704731
secretName:
@@ -713,6 +740,7 @@ spec:
713740
secretRef:
714741
properties:
715742
name:
743+
default: ""
716744
type: string
717745
type: object
718746
x-kubernetes-map-type: atomic

‎apis/bases/dataplane.openstack.org_openstackdataplaneservices.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: openstackdataplaneservices.dataplane.openstack.org
88
spec:
99
group: dataplane.openstack.org

‎apis/bases/lightspeed.openstack.org_openstacklightspeeds.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: openstacklightspeeds.lightspeed.openstack.org
88
spec:
99
group: lightspeed.openstack.org

‎apis/bases/operator.openstack.org_openstacks.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: openstacks.operator.openstack.org
88
spec:
99
group: operator.openstack.org
@@ -46,6 +46,8 @@ spec:
4646
properties:
4747
name:
4848
type: string
49+
request:
50+
type: string
4951
required:
5052
- name
5153
type: object

‎apis/go.mod‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,21 @@ require (
3535
go.uber.org/zap v1.27.0 // indirect
3636
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
3737
golang.org/x/tools v0.24.0 // indirect
38-
k8s.io/api v0.29.15
39-
k8s.io/apimachinery v0.29.15
40-
k8s.io/client-go v0.29.15
41-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
42-
sigs.k8s.io/controller-runtime v0.17.6
38+
k8s.io/api v0.31.12
39+
k8s.io/apimachinery v0.31.12
40+
k8s.io/client-go v0.31.12
41+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
42+
sigs.k8s.io/controller-runtime v0.19.7
4343
)
4444

4545
require (
4646
github.com/beorn7/perks v1.0.1 // indirect
47-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
47+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4848
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4949
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
5050
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
5151
github.com/fsnotify/fsnotify v1.7.0 // indirect
52+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
5253
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
5354
github.com/go-logr/logr v1.4.3 // indirect
5455
github.com/go-logr/zapr v1.3.0 // indirect
@@ -80,40 +81,39 @@ require (
8081
github.com/openshift/api v3.9.0+incompatible // indirect
8182
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250823121217-7e1cd2e3dd03 // indirect
8283
github.com/pkg/errors v0.9.1 // indirect
83-
github.com/prometheus/client_golang v1.19.0 // indirect
84-
github.com/prometheus/client_model v0.6.0 // indirect
85-
github.com/prometheus/common v0.53.0 // indirect
86-
github.com/prometheus/procfs v0.13.0 // indirect
84+
github.com/prometheus/client_golang v1.19.1 // indirect
85+
github.com/prometheus/client_model v0.6.1 // indirect
86+
github.com/prometheus/common v0.55.0 // indirect
87+
github.com/prometheus/procfs v0.15.1 // indirect
8788
github.com/rabbitmq/cluster-operator/v2 v2.9.0 // indirect
8889
github.com/robfig/cron/v3 v3.0.1 // indirect
8990
github.com/spf13/pflag v1.0.6 // indirect
9091
github.com/stretchr/testify v1.11.1 // indirect
92+
github.com/x448/float16 v0.8.4 // indirect
9193
golang.org/x/crypto v0.33.0 // indirect
9294
golang.org/x/net v0.34.0 // indirect
93-
golang.org/x/oauth2 v0.18.0 // indirect
95+
golang.org/x/oauth2 v0.21.0 // indirect
9496
golang.org/x/sys v0.30.0 // indirect
9597
golang.org/x/term v0.29.0 // indirect
9698
golang.org/x/text v0.22.0 // indirect
9799
golang.org/x/time v0.5.0 // indirect
98100
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
99-
google.golang.org/appengine v1.6.8 // indirect
100-
google.golang.org/protobuf v1.34.1 // indirect
101+
google.golang.org/protobuf v1.34.2 // indirect
101102
gopkg.in/inf.v0 v0.9.1 // indirect
102103
gopkg.in/yaml.v2 v2.4.0 // indirect
103104
gopkg.in/yaml.v3 v3.0.1 // indirect
104-
k8s.io/apiextensions-apiserver v0.29.15 // indirect
105-
k8s.io/component-base v0.29.15 // indirect
106-
k8s.io/klog/v2 v2.120.1 // indirect
105+
k8s.io/apiextensions-apiserver v0.31.12 // indirect
106+
k8s.io/klog/v2 v2.130.1 // indirect
107107
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
108108
sigs.k8s.io/gateway-api v1.0.0 // indirect
109109
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
110110
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
111111
sigs.k8s.io/yaml v1.4.0 // indirect
112112
)
113113

114-
// mschuppert: map to latest commit from release-4.16 tag
114+
// mschuppert: map to latest commit from release-4.18 tag
115115
// must consistent within modules and service operators
116-
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094 //allow-merging
116+
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e //allow-merging
117117

118118
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.9.0_patches_tag_n)
119119
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d //allow-merging

0 commit comments

Comments
 (0)