Skip to content

Commit 42b39cc

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 <[email protected]>
1 parent b637aa8 commit 42b39cc

22 files changed

+329
-521
lines changed

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ endif
5050
DEFAULT_IMG ?= quay.io/openstack-k8s-operators/designate-operator:latest
5151
IMG ?= $(DEFAULT_IMG)
5252
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
53-
ENVTEST_K8S_VERSION = 1.29
53+
ENVTEST_K8S_VERSION = 1.31
5454

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

188188
## Tool Versions
189189
KUSTOMIZE_VERSION ?= v3.8.7
190-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
190+
CONTROLLER_TOOLS_VERSION ?= v0.18.0
191191
OPERATOR_SDK_VERSION ?= v1.31.0
192192
GOTOOLCHAIN_VERSION ?= go1.24.0
193193

@@ -205,7 +205,7 @@ $(CONTROLLER_GEN): $(LOCALBIN)
205205
.PHONY: envtest
206206
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
207207
$(ENVTEST): $(LOCALBIN)
208-
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@c7e1dc9b
208+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
209209

210210
.PHONY: operator-sdk
211211
operator-sdk: $(OPERATOR_SDK) ## Download operator-sdk locally if necessary.

‎api/bases/designate.openstack.org_designateapis.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: designateapis.designate.openstack.org
88
spec:
99
group: designate.openstack.org
@@ -105,7 +105,6 @@ spec:
105105
description: |-
106106
ConfigOverwrite - interface to overwrite default config files like e.g. policy.json.
107107
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
108-
TODO: -> implement
109108
type: object
110109
networkAttachments:
111110
description: NetworkAttachments is a list of NetworkAttachment resource
@@ -308,11 +307,9 @@ spec:
308307
Claims lists the names of resources, defined in spec.resourceClaims,
309308
that are used by this container.
310309
311-
312310
This is an alpha field and requires enabling the
313311
DynamicResourceAllocation feature gate.
314312
315-
316313
This field is immutable. It can only be set for containers.
317314
items:
318315
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -323,6 +320,12 @@ spec:
323320
the Pod where this field is used. It makes that resource available
324321
inside a container.
325322
type: string
323+
request:
324+
description: |-
325+
Request is the name chosen for a request in the referenced claim.
326+
If empty, everything from the claim is made available, otherwise
327+
only the result of this request.
328+
type: string
326329
required:
327330
- name
328331
type: object

‎api/bases/designate.openstack.org_designatebackendbind9s.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: designatebackendbind9s.designate.openstack.org
88
spec:
99
group: designate.openstack.org
@@ -107,7 +107,6 @@ spec:
107107
description: |-
108108
ConfigOverwrite - interface to overwrite default config files like e.g. policy.json.
109109
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
110-
TODO: -> implement
111110
type: object
112111
netUtilsImage:
113112
description: NetUtilsImage - NetUtils container image
@@ -310,11 +309,9 @@ spec:
310309
Claims lists the names of resources, defined in spec.resourceClaims,
311310
that are used by this container.
312311
313-
314312
This is an alpha field and requires enabling the
315313
DynamicResourceAllocation feature gate.
316314
317-
318315
This field is immutable. It can only be set for containers.
319316
items:
320317
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -325,6 +322,12 @@ spec:
325322
the Pod where this field is used. It makes that resource available
326323
inside a container.
327324
type: string
325+
request:
326+
description: |-
327+
Request is the name chosen for a request in the referenced claim.
328+
If empty, everything from the claim is made available, otherwise
329+
only the result of this request.
330+
type: string
328331
required:
329332
- name
330333
type: object

‎api/bases/designate.openstack.org_designatecentrals.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: designatecentrals.designate.openstack.org
88
spec:
99
group: designate.openstack.org
@@ -102,7 +102,6 @@ spec:
102102
description: |-
103103
ConfigOverwrite - interface to overwrite default config files like e.g. policy.json.
104104
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
105-
TODO: -> implement
106105
type: object
107106
networkAttachments:
108107
description: NetworkAttachments is a list of NetworkAttachment resource
@@ -152,11 +151,9 @@ spec:
152151
Claims lists the names of resources, defined in spec.resourceClaims,
153152
that are used by this container.
154153
155-
156154
This is an alpha field and requires enabling the
157155
DynamicResourceAllocation feature gate.
158156
159-
160157
This field is immutable. It can only be set for containers.
161158
items:
162159
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -167,6 +164,12 @@ spec:
167164
the Pod where this field is used. It makes that resource available
168165
inside a container.
169166
type: string
167+
request:
168+
description: |-
169+
Request is the name chosen for a request in the referenced claim.
170+
If empty, everything from the claim is made available, otherwise
171+
only the result of this request.
172+
type: string
170173
required:
171174
- name
172175
type: object

‎api/bases/designate.openstack.org_designatemdnses.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: designatemdnses.designate.openstack.org
88
spec:
99
group: designate.openstack.org
@@ -107,7 +107,6 @@ spec:
107107
description: |-
108108
ConfigOverwrite - interface to overwrite default config files like e.g. policy.json.
109109
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
110-
TODO: -> implement
111110
type: object
112111
netUtilsImage:
113112
description: NetUtilsImage - NetUtils container image
@@ -310,11 +309,9 @@ spec:
310309
Claims lists the names of resources, defined in spec.resourceClaims,
311310
that are used by this container.
312311
313-
314312
This is an alpha field and requires enabling the
315313
DynamicResourceAllocation feature gate.
316314
317-
318315
This field is immutable. It can only be set for containers.
319316
items:
320317
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -325,6 +322,12 @@ spec:
325322
the Pod where this field is used. It makes that resource available
326323
inside a container.
327324
type: string
325+
request:
326+
description: |-
327+
Request is the name chosen for a request in the referenced claim.
328+
If empty, everything from the claim is made available, otherwise
329+
only the result of this request.
330+
type: string
328331
required:
329332
- name
330333
type: object

‎api/bases/designate.openstack.org_designateproducers.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: designateproducers.designate.openstack.org
88
spec:
99
group: designate.openstack.org
@@ -101,7 +101,6 @@ spec:
101101
description: |-
102102
ConfigOverwrite - interface to overwrite default config files like e.g. policy.json.
103103
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
104-
TODO: -> implement
105104
type: object
106105
networkAttachments:
107106
description: NetworkAttachments is a list of NetworkAttachment resource
@@ -151,11 +150,9 @@ spec:
151150
Claims lists the names of resources, defined in spec.resourceClaims,
152151
that are used by this container.
153152
154-
155153
This is an alpha field and requires enabling the
156154
DynamicResourceAllocation feature gate.
157155
158-
159156
This field is immutable. It can only be set for containers.
160157
items:
161158
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -166,6 +163,12 @@ spec:
166163
the Pod where this field is used. It makes that resource available
167164
inside a container.
168165
type: string
166+
request:
167+
description: |-
168+
Request is the name chosen for a request in the referenced claim.
169+
If empty, everything from the claim is made available, otherwise
170+
only the result of this request.
171+
type: string
169172
required:
170173
- name
171174
type: object

0 commit comments

Comments
 (0)