Skip to content

Commit bf1eceb

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 Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
1 parent e7b767d commit bf1eceb

16 files changed

Lines changed: 238 additions & 413 deletions

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ OPERATOR_SDK_VERSION ?= v1.31.0
5353
# Image URL to use all building/pushing image targets
5454
IMG ?= controller:latest
5555
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
56-
ENVTEST_K8S_VERSION = 1.29
56+
ENVTEST_K8S_VERSION = 1.31
5757

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

198198
## Tool Versions
199199
KUSTOMIZE_VERSION ?= v3.8.7
200-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
200+
CONTROLLER_TOOLS_VERSION ?= v0.18.0
201201

202202
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
203203
.PHONY: kustomize
@@ -218,7 +218,7 @@ $(CONTROLLER_GEN): $(LOCALBIN)
218218
.PHONY: envtest
219219
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
220220
$(ENVTEST): $(LOCALBIN)
221-
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@c7e1dc9b
221+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
222222

223223
.PHONY: operator-sdk
224224
OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk

‎api/bases/ironic.openstack.org_ironicapis.yaml‎

Lines changed: 7 additions & 4 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: ironicapis.ironic.openstack.org
88
spec:
99
group: ironic.openstack.org
@@ -81,7 +81,6 @@ spec:
8181
description: |-
8282
ConfigOverwrite - interface to overwrite default config files like e.g. policy.json.
8383
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
84-
TODO: -> implement
8584
type: object
8685
keystoneEndpoints:
8786
description: KeystoneEndpoints - Internally used Keystone API endpoints
@@ -294,11 +293,9 @@ spec:
294293
Claims lists the names of resources, defined in spec.resourceClaims,
295294
that are used by this container.
296295
297-
298296
This is an alpha field and requires enabling the
299297
DynamicResourceAllocation feature gate.
300298
301-
302299
This field is immutable. It can only be set for containers.
303300
items:
304301
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -309,6 +306,12 @@ spec:
309306
the Pod where this field is used. It makes that resource available
310307
inside a container.
311308
type: string
309+
request:
310+
description: |-
311+
Request is the name chosen for a request in the referenced claim.
312+
If empty, everything from the claim is made available, otherwise
313+
only the result of this request.
314+
type: string
312315
required:
313316
- name
314317
type: object

‎api/bases/ironic.openstack.org_ironicconductors.yaml‎

Lines changed: 7 additions & 4 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: ironicconductors.ironic.openstack.org
88
spec:
99
group: ironic.openstack.org
@@ -79,7 +79,6 @@ spec:
7979
description: |-
8080
ConfigOverwrite - interface to overwrite default config files like e.g. policy.json.
8181
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
82-
TODO: -> implement
8382
type: object
8483
dhcpRanges:
8584
description: DHCPRanges - List of DHCP ranges to use for provisioning
@@ -179,11 +178,9 @@ spec:
179178
Claims lists the names of resources, defined in spec.resourceClaims,
180179
that are used by this container.
181180
182-
183181
This is an alpha field and requires enabling the
184182
DynamicResourceAllocation feature gate.
185183
186-
187184
This field is immutable. It can only be set for containers.
188185
items:
189186
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -194,6 +191,12 @@ spec:
194191
the Pod where this field is used. It makes that resource available
195192
inside a container.
196193
type: string
194+
request:
195+
description: |-
196+
Request is the name chosen for a request in the referenced claim.
197+
If empty, everything from the claim is made available, otherwise
198+
only the result of this request.
199+
type: string
197200
required:
198201
- name
199202
type: object

‎api/bases/ironic.openstack.org_ironicinspectors.yaml‎

Lines changed: 7 additions & 4 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: ironicinspectors.ironic.openstack.org
88
spec:
99
group: ironic.openstack.org
@@ -87,7 +87,6 @@ spec:
8787
description: |-
8888
ConfigOverwrite - interface to overwrite default config files like e.g. policy.json.
8989
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
90-
TODO: -> implement
9190
type: object
9291
dhcpRanges:
9392
description: DHCPRanges - List of DHCP ranges to use for provisioning
@@ -348,11 +347,9 @@ spec:
348347
Claims lists the names of resources, defined in spec.resourceClaims,
349348
that are used by this container.
350349
351-
352350
This is an alpha field and requires enabling the
353351
DynamicResourceAllocation feature gate.
354352
355-
356353
This field is immutable. It can only be set for containers.
357354
items:
358355
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -363,6 +360,12 @@ spec:
363360
the Pod where this field is used. It makes that resource available
364361
inside a container.
365362
type: string
363+
request:
364+
description: |-
365+
Request is the name chosen for a request in the referenced claim.
366+
If empty, everything from the claim is made available, otherwise
367+
only the result of this request.
368+
type: string
366369
required:
367370
- name
368371
type: object

‎api/bases/ironic.openstack.org_ironicneutronagents.yaml‎

Lines changed: 7 additions & 4 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: ironicneutronagents.ironic.openstack.org
88
spec:
99
group: ironic.openstack.org
@@ -71,7 +71,6 @@ spec:
7171
description: |-
7272
ConfigOverwrite - interface to overwrite default config files like e.g. policy.json.
7373
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
74-
TODO: -> implement
7574
type: object
7675
nodeSelector:
7776
additionalProperties:
@@ -115,11 +114,9 @@ spec:
115114
Claims lists the names of resources, defined in spec.resourceClaims,
116115
that are used by this container.
117116
118-
119117
This is an alpha field and requires enabling the
120118
DynamicResourceAllocation feature gate.
121119
122-
123120
This field is immutable. It can only be set for containers.
124121
items:
125122
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -130,6 +127,12 @@ spec:
130127
the Pod where this field is used. It makes that resource available
131128
inside a container.
132129
type: string
130+
request:
131+
description: |-
132+
Request is the name chosen for a request in the referenced claim.
133+
If empty, everything from the claim is made available, otherwise
134+
only the result of this request.
135+
type: string
133136
required:
134137
- name
135138
type: object

‎api/bases/ironic.openstack.org_ironics.yaml‎

Lines changed: 25 additions & 14 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: ironics.ironic.openstack.org
88
spec:
99
group: ironic.openstack.org
@@ -77,7 +77,6 @@ spec:
7777
description: |-
7878
ConfigOverwrite - interface to overwrite default config files like e.g. policy.json.
7979
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
80-
TODO: -> implement
8180
type: object
8281
images:
8382
default: {}
@@ -125,7 +124,6 @@ spec:
125124
description: |-
126125
ConfigOverwrite - interface to overwrite default config files like e.g. policy.json.
127126
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
128-
TODO: -> implement
129127
type: object
130128
networkAttachments:
131129
description: NetworkAttachments is a list of NetworkAttachment
@@ -316,11 +314,9 @@ spec:
316314
Claims lists the names of resources, defined in spec.resourceClaims,
317315
that are used by this container.
318316
319-
320317
This is an alpha field and requires enabling the
321318
DynamicResourceAllocation feature gate.
322319
323-
324320
This field is immutable. It can only be set for containers.
325321
items:
326322
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -331,6 +327,12 @@ spec:
331327
the Pod where this field is used. It makes that resource available
332328
inside a container.
333329
type: string
330+
request:
331+
description: |-
332+
Request is the name chosen for a request in the referenced claim.
333+
If empty, everything from the claim is made available, otherwise
334+
only the result of this request.
335+
type: string
334336
required:
335337
- name
336338
type: object
@@ -435,7 +437,6 @@ spec:
435437
description: |-
436438
ConfigOverwrite - interface to overwrite default config files like e.g. policy.json.
437439
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
438-
TODO: -> implement
439440
type: object
440441
dhcpRanges:
441442
description: DHCPRanges - List of DHCP ranges to use for provisioning
@@ -506,11 +507,9 @@ spec:
506507
Claims lists the names of resources, defined in spec.resourceClaims,
507508
that are used by this container.
508509
509-
510510
This is an alpha field and requires enabling the
511511
DynamicResourceAllocation feature gate.
512512
513-
514513
This field is immutable. It can only be set for containers.
515514
items:
516515
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -521,6 +520,12 @@ spec:
521520
the Pod where this field is used. It makes that resource available
522521
inside a container.
523522
type: string
523+
request:
524+
description: |-
525+
Request is the name chosen for a request in the referenced claim.
526+
If empty, everything from the claim is made available, otherwise
527+
only the result of this request.
528+
type: string
524529
required:
525530
- name
526531
type: object
@@ -608,7 +613,6 @@ spec:
608613
description: |-
609614
ConfigOverwrite - interface to overwrite default config files like e.g. policy.json.
610615
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
611-
TODO: -> implement
612616
type: object
613617
dhcpRanges:
614618
description: DHCPRanges - List of DHCP ranges to use for provisioning
@@ -855,11 +859,9 @@ spec:
855859
Claims lists the names of resources, defined in spec.resourceClaims,
856860
that are used by this container.
857861
858-
859862
This is an alpha field and requires enabling the
860863
DynamicResourceAllocation feature gate.
861864
862-
863865
This field is immutable. It can only be set for containers.
864866
items:
865867
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -870,6 +872,12 @@ spec:
870872
the Pod where this field is used. It makes that resource available
871873
inside a container.
872874
type: string
875+
request:
876+
description: |-
877+
Request is the name chosen for a request in the referenced claim.
878+
If empty, everything from the claim is made available, otherwise
879+
only the result of this request.
880+
type: string
873881
required:
874882
- name
875883
type: object
@@ -977,7 +985,6 @@ spec:
977985
description: |-
978986
ConfigOverwrite - interface to overwrite default config files like e.g. policy.json.
979987
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
980-
TODO: -> implement
981988
type: object
982989
nodeSelector:
983990
additionalProperties:
@@ -1009,11 +1016,9 @@ spec:
10091016
Claims lists the names of resources, defined in spec.resourceClaims,
10101017
that are used by this container.
10111018
1012-
10131019
This is an alpha field and requires enabling the
10141020
DynamicResourceAllocation feature gate.
10151021
1016-
10171022
This field is immutable. It can only be set for containers.
10181023
items:
10191024
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -1024,6 +1029,12 @@ spec:
10241029
the Pod where this field is used. It makes that resource available
10251030
inside a container.
10261031
type: string
1032+
request:
1033+
description: |-
1034+
Request is the name chosen for a request in the referenced claim.
1035+
If empty, everything from the claim is made available, otherwise
1036+
only the result of this request.
1037+
type: string
10271038
required:
10281039
- name
10291040
type: object

0 commit comments

Comments
 (0)