Skip to content

Commit 2fddd30

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.0, setup-envtest@latest Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
1 parent 08eb352 commit 2fddd30

14 files changed

Lines changed: 207 additions & 349 deletions

‎Makefile‎

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

5959
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
6060
ifeq (,$(shell go env GOBIN))
@@ -207,7 +207,7 @@ GINKGO ?= $(LOCALBIN)/ginkgo
207207

208208
## Tool Versions
209209
KUSTOMIZE_VERSION ?= v3.8.7
210-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
210+
CONTROLLER_TOOLS_VERSION ?= v0.18.0
211211
GOTOOLCHAIN_VERSION ?= go1.24.0
212212

213213
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
@@ -229,7 +229,7 @@ $(CONTROLLER_GEN): $(LOCALBIN)
229229
.PHONY: envtest
230230
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
231231
$(ENVTEST): $(LOCALBIN)
232-
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@c7e1dc9b
232+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
233233

234234
.PHONY: ginkgo
235235
ginkgo: $(GINKGO) ## Download ginkgo locally if necessary.

‎api/bases/barbican.openstack.org_barbicanapis.yaml‎

Lines changed: 7 additions & 5 deletions
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: barbicanapis.barbican.openstack.org
88
spec:
99
group: barbican.openstack.org
@@ -81,7 +81,6 @@ spec:
8181
databaseInstance:
8282
description: |-
8383
MariaDB instance name
84-
TODO(dmendiza): Is this comment right?
8584
Right now required by the maridb-operator to get the credentials from the instance to create the DB
8685
Might not be required in future
8786
type: string
@@ -91,7 +90,6 @@ spec:
9190
description: |-
9291
ConfigOverwrite - interface to overwrite default config files like e.g. policy.json.
9392
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
94-
TODO: -> implement
9593
type: object
9694
enableSecureRBAC:
9795
default: true
@@ -360,11 +358,9 @@ spec:
360358
Claims lists the names of resources, defined in spec.resourceClaims,
361359
that are used by this container.
362360
363-
364361
This is an alpha field and requires enabling the
365362
DynamicResourceAllocation feature gate.
366363
367-
368364
This field is immutable. It can only be set for containers.
369365
items:
370366
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -375,6 +371,12 @@ spec:
375371
the Pod where this field is used. It makes that resource available
376372
inside a container.
377373
type: string
374+
request:
375+
description: |-
376+
Request is the name chosen for a request in the referenced claim.
377+
If empty, everything from the claim is made available, otherwise
378+
only the result of this request.
379+
type: string
378380
required:
379381
- name
380382
type: object

‎api/bases/barbican.openstack.org_barbicankeystonelisteners.yaml‎

Lines changed: 7 additions & 5 deletions
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: barbicankeystonelisteners.barbican.openstack.org
88
spec:
99
group: barbican.openstack.org
@@ -78,7 +78,6 @@ spec:
7878
databaseInstance:
7979
description: |-
8080
MariaDB instance name
81-
TODO(dmendiza): Is this comment right?
8281
Right now required by the maridb-operator to get the credentials from the instance to create the DB
8382
Might not be required in future
8483
type: string
@@ -88,7 +87,6 @@ spec:
8887
description: |-
8988
ConfigOverwrite - interface to overwrite default config files like e.g. policy.json.
9089
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
91-
TODO: -> implement
9290
type: object
9391
enabledSecretStores:
9492
items:
@@ -193,11 +191,9 @@ spec:
193191
Claims lists the names of resources, defined in spec.resourceClaims,
194192
that are used by this container.
195193
196-
197194
This is an alpha field and requires enabling the
198195
DynamicResourceAllocation feature gate.
199196
200-
201197
This field is immutable. It can only be set for containers.
202198
items:
203199
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -208,6 +204,12 @@ spec:
208204
the Pod where this field is used. It makes that resource available
209205
inside a container.
210206
type: string
207+
request:
208+
description: |-
209+
Request is the name chosen for a request in the referenced claim.
210+
If empty, everything from the claim is made available, otherwise
211+
only the result of this request.
212+
type: string
211213
required:
212214
- name
213215
type: object

‎api/bases/barbican.openstack.org_barbicans.yaml‎

Lines changed: 19 additions & 12 deletions
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: barbicans.barbican.openstack.org
88
spec:
99
group: barbican.openstack.org
@@ -85,7 +85,6 @@ spec:
8585
description: |-
8686
ConfigOverwrite - interface to overwrite default config files like e.g. policy.json.
8787
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
88-
TODO: -> implement
8988
type: object
9089
enableSecureRBAC:
9190
default: true
@@ -281,11 +280,9 @@ spec:
281280
Claims lists the names of resources, defined in spec.resourceClaims,
282281
that are used by this container.
283282
284-
285283
This is an alpha field and requires enabling the
286284
DynamicResourceAllocation feature gate.
287285
288-
289286
This field is immutable. It can only be set for containers.
290287
items:
291288
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -296,6 +293,12 @@ spec:
296293
the Pod where this field is used. It makes that resource available
297294
inside a container.
298295
type: string
296+
request:
297+
description: |-
298+
Request is the name chosen for a request in the referenced claim.
299+
If empty, everything from the claim is made available, otherwise
300+
only the result of this request.
301+
type: string
299302
required:
300303
- name
301304
type: object
@@ -407,7 +410,6 @@ spec:
407410
description: |-
408411
ConfigOverwrite - interface to overwrite default config files like e.g. policy.json.
409412
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
410-
TODO: -> implement
411413
type: object
412414
networkAttachments:
413415
description: NetworkAttachments is a list of NetworkAttachment
@@ -439,11 +441,9 @@ spec:
439441
Claims lists the names of resources, defined in spec.resourceClaims,
440442
that are used by this container.
441443
442-
443444
This is an alpha field and requires enabling the
444445
DynamicResourceAllocation feature gate.
445446
446-
447447
This field is immutable. It can only be set for containers.
448448
items:
449449
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -454,6 +454,12 @@ spec:
454454
the Pod where this field is used. It makes that resource available
455455
inside a container.
456456
type: string
457+
request:
458+
description: |-
459+
Request is the name chosen for a request in the referenced claim.
460+
If empty, everything from the claim is made available, otherwise
461+
only the result of this request.
462+
type: string
457463
required:
458464
- name
459465
type: object
@@ -535,7 +541,6 @@ spec:
535541
description: |-
536542
ConfigOverwrite - interface to overwrite default config files like e.g. policy.json.
537543
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
538-
TODO: -> implement
539544
type: object
540545
networkAttachments:
541546
description: NetworkAttachments is a list of NetworkAttachment
@@ -567,11 +572,9 @@ spec:
567572
Claims lists the names of resources, defined in spec.resourceClaims,
568573
that are used by this container.
569574
570-
571575
This is an alpha field and requires enabling the
572576
DynamicResourceAllocation feature gate.
573577
574-
575578
This field is immutable. It can only be set for containers.
576579
items:
577580
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -582,6 +585,12 @@ spec:
582585
the Pod where this field is used. It makes that resource available
583586
inside a container.
584587
type: string
588+
request:
589+
description: |-
590+
Request is the name chosen for a request in the referenced claim.
591+
If empty, everything from the claim is made available, otherwise
592+
only the result of this request.
593+
type: string
585594
required:
586595
- name
587596
type: object
@@ -649,7 +658,6 @@ spec:
649658
databaseInstance:
650659
description: |-
651660
MariaDB instance name
652-
TODO(dmendiza): Is this comment right?
653661
Right now required by the maridb-operator to get the credentials from the instance to create the DB
654662
Might not be required in future
655663
type: string
@@ -659,7 +667,6 @@ spec:
659667
description: |-
660668
ConfigOverwrite - interface to overwrite default config files like e.g. logging.conf or policy.json.
661669
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
662-
TODO(dmendiza): -> implement
663670
type: object
664671
enabledSecretStores:
665672
items:

‎api/bases/barbican.openstack.org_barbicanworkers.yaml‎

Lines changed: 7 additions & 5 deletions
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: barbicanworkers.barbican.openstack.org
88
spec:
99
group: barbican.openstack.org
@@ -76,7 +76,6 @@ spec:
7676
databaseInstance:
7777
description: |-
7878
MariaDB instance name
79-
TODO(dmendiza): Is this comment right?
8079
Right now required by the maridb-operator to get the credentials from the instance to create the DB
8180
Might not be required in future
8281
type: string
@@ -86,7 +85,6 @@ spec:
8685
description: |-
8786
ConfigOverwrite - interface to overwrite default config files like e.g. policy.json.
8887
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
89-
TODO: -> implement
9088
type: object
9189
enabledSecretStores:
9290
items:
@@ -191,11 +189,9 @@ spec:
191189
Claims lists the names of resources, defined in spec.resourceClaims,
192190
that are used by this container.
193191
194-
195192
This is an alpha field and requires enabling the
196193
DynamicResourceAllocation feature gate.
197194
198-
199195
This field is immutable. It can only be set for containers.
200196
items:
201197
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -206,6 +202,12 @@ spec:
206202
the Pod where this field is used. It makes that resource available
207203
inside a container.
208204
type: string
205+
request:
206+
description: |-
207+
Request is the name chosen for a request in the referenced claim.
208+
If empty, everything from the claim is made available, otherwise
209+
only the result of this request.
210+
type: string
209211
required:
210212
- name
211213
type: object

‎api/go.mod‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,20 @@ require (
77
github.com/onsi/gomega v1.34.1
88
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250813063935-fdc20530dcf1
99
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250730071847-837b07f8d72f
10-
k8s.io/api v0.29.15
11-
k8s.io/apimachinery v0.29.15
12-
k8s.io/client-go v0.29.15
13-
sigs.k8s.io/controller-runtime v0.17.6
10+
k8s.io/api v0.31.12
11+
k8s.io/apimachinery v0.31.12
12+
k8s.io/client-go v0.31.12
13+
sigs.k8s.io/controller-runtime v0.19.7
1414
)
1515

1616
require (
1717
github.com/beorn7/perks v1.0.1 // indirect
18-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
18+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
1919
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2020
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
2121
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
2222
github.com/fsnotify/fsnotify v1.7.0 // indirect
23+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
2324
github.com/go-logr/logr v1.4.3 // indirect
2425
github.com/go-logr/zapr v1.3.0 // indirect
2526
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -42,37 +43,36 @@ require (
4243
github.com/modern-go/reflect2 v1.0.2 // indirect
4344
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4445
github.com/pkg/errors v0.9.1 // indirect
45-
github.com/prometheus/client_golang v1.19.0 // indirect
46-
github.com/prometheus/client_model v0.6.0 // indirect
47-
github.com/prometheus/common v0.51.1 // indirect
48-
github.com/prometheus/procfs v0.13.0 // indirect
46+
github.com/prometheus/client_golang v1.19.1 // indirect
47+
github.com/prometheus/client_model v0.6.1 // indirect
48+
github.com/prometheus/common v0.55.0 // indirect
49+
github.com/prometheus/procfs v0.15.1 // indirect
4950
github.com/spf13/pflag v1.0.5 // indirect
51+
github.com/x448/float16 v0.8.4 // indirect
5052
go.uber.org/multierr v1.11.0 // indirect
5153
go.uber.org/zap v1.27.0 // indirect
5254
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
5355
golang.org/x/net v0.28.0 // indirect
54-
golang.org/x/oauth2 v0.18.0 // indirect
56+
golang.org/x/oauth2 v0.21.0 // indirect
5557
golang.org/x/sys v0.23.0 // indirect
5658
golang.org/x/term v0.23.0 // indirect
5759
golang.org/x/text v0.17.0 // indirect
5860
golang.org/x/time v0.5.0 // indirect
5961
golang.org/x/tools v0.24.0 // indirect
6062
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
61-
google.golang.org/appengine v1.6.8 // indirect
62-
google.golang.org/protobuf v1.34.1 // indirect
63+
google.golang.org/protobuf v1.34.2 // indirect
6364
gopkg.in/inf.v0 v0.9.1 // indirect
6465
gopkg.in/yaml.v2 v2.4.0 // indirect
6566
gopkg.in/yaml.v3 v3.0.1 // indirect
66-
k8s.io/apiextensions-apiserver v0.29.15 // indirect
67-
k8s.io/component-base v0.29.15 // indirect
68-
k8s.io/klog/v2 v2.120.1 // indirect
67+
k8s.io/apiextensions-apiserver v0.31.12 // indirect
68+
k8s.io/klog/v2 v2.130.1 // indirect
6969
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
70-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
70+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
7171
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7272
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
7373
sigs.k8s.io/yaml v1.4.0 // indirect
7474
)
7575

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

0 commit comments

Comments
 (0)