Skip to content

Commit bceeeee

Browse files
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 b05937c commit bceeeee

30 files changed

Lines changed: 518 additions & 580 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/infra-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
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@c7e1dc9
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.

apis/bases/instanceha.openstack.org_instancehas.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: instancehas.instanceha.openstack.org
88
spec:
99
group: instanceha.openstack.org

apis/bases/memcached.openstack.org_memcacheds.yaml

Lines changed: 7 additions & 3 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: memcacheds.memcached.openstack.org
88
spec:
99
group: memcached.openstack.org
@@ -83,11 +83,9 @@ spec:
8383
Claims lists the names of resources, defined in spec.resourceClaims,
8484
that are used by this container.
8585
86-
8786
This is an alpha field and requires enabling the
8887
DynamicResourceAllocation feature gate.
8988
90-
9189
This field is immutable. It can only be set for containers.
9290
items:
9391
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -98,6 +96,12 @@ spec:
9896
the Pod where this field is used. It makes that resource available
9997
inside a container.
10098
type: string
99+
request:
100+
description: |-
101+
Request is the name chosen for a request in the referenced claim.
102+
If empty, everything from the claim is made available, otherwise
103+
only the result of this request.
104+
type: string
101105
required:
102106
- name
103107
type: object

apis/bases/network.openstack.org_bgpconfigurations.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: bgpconfigurations.network.openstack.org
88
spec:
99
group: network.openstack.org
@@ -86,11 +86,13 @@ spec:
8686
items:
8787
type: string
8888
type: array
89+
x-kubernetes-list-type: atomic
8990
required:
9091
- key
9192
- operator
9293
type: object
9394
type: array
95+
x-kubernetes-list-type: atomic
9496
matchLabels:
9597
additionalProperties:
9698
type: string

apis/bases/network.openstack.org_dnsdata.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: dnsdata.network.openstack.org
88
spec:
99
group: network.openstack.org

apis/bases/network.openstack.org_dnsmasqs.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: dnsmasqs.network.openstack.org
88
spec:
99
group: network.openstack.org

apis/bases/network.openstack.org_ipsets.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: ipsets.network.openstack.org
88
spec:
99
group: network.openstack.org

apis/bases/network.openstack.org_netconfigs.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: netconfigs.network.openstack.org
88
spec:
99
group: network.openstack.org

apis/bases/network.openstack.org_reservations.yaml

Lines changed: 1 addition & 2 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: reservations.network.openstack.org
88
spec:
99
group: network.openstack.org
@@ -60,7 +60,6 @@ spec:
6060
the event) or if no container name is specified "spec.containers[2]" (container with
6161
index 2 in this pod). This syntax is chosen only to have some well-defined way of
6262
referencing a part of an object.
63-
TODO: this design is not final and this field is subject to change in the future.
6463
type: string
6564
kind:
6665
description: |-

0 commit comments

Comments
 (0)