Skip to content

Commit bc8cd06

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 f709752 commit bc8cd06

12 files changed

+169
-282
lines changed

‎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/ovn-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))
@@ -208,7 +208,7 @@ GINKGO ?= $(LOCALBIN)/ginkgo
208208

209209
## Tool Versions
210210
KUSTOMIZE_VERSION ?= v3.8.7
211-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
211+
CONTROLLER_TOOLS_VERSION ?= v0.18.0
212212

213213
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
214214
.PHONY: kustomize
@@ -230,7 +230,7 @@ $(CONTROLLER_GEN): $(LOCALBIN)
230230
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
231231
$(ENVTEST): $(LOCALBIN)
232232
# TODO: revisit pinned version once https://github.com/kubernetes-sigs/controller-runtime/issues/2720 is fixed
233-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@c7e1dc9
233+
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
234234

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

‎api/bases/ovn.openstack.org_ovncontrollers.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: ovncontrollers.ovn.openstack.org
88
spec:
99
group: ovn.openstack.org
@@ -123,11 +123,9 @@ spec:
123123
Claims lists the names of resources, defined in spec.resourceClaims,
124124
that are used by this container.
125125
126-
127126
This is an alpha field and requires enabling the
128127
DynamicResourceAllocation feature gate.
129128
130-
131129
This field is immutable. It can only be set for containers.
132130
items:
133131
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -138,6 +136,12 @@ spec:
138136
the Pod where this field is used. It makes that resource available
139137
inside a container.
140138
type: string
139+
request:
140+
description: |-
141+
Request is the name chosen for a request in the referenced claim.
142+
If empty, everything from the claim is made available, otherwise
143+
only the result of this request.
144+
type: string
141145
required:
142146
- name
143147
type: object

‎api/bases/ovn.openstack.org_ovndbclusters.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: ovndbclusters.ovn.openstack.org
88
spec:
99
group: ovn.openstack.org
@@ -270,11 +270,9 @@ spec:
270270
Claims lists the names of resources, defined in spec.resourceClaims,
271271
that are used by this container.
272272
273-
274273
This is an alpha field and requires enabling the
275274
DynamicResourceAllocation feature gate.
276275
277-
278276
This field is immutable. It can only be set for containers.
279277
items:
280278
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -285,6 +283,12 @@ spec:
285283
the Pod where this field is used. It makes that resource available
286284
inside a container.
287285
type: string
286+
request:
287+
description: |-
288+
Request is the name chosen for a request in the referenced claim.
289+
If empty, everything from the claim is made available, otherwise
290+
only the result of this request.
291+
type: string
288292
required:
289293
- name
290294
type: object

‎api/bases/ovn.openstack.org_ovnnorthds.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: ovnnorthds.ovn.openstack.org
88
spec:
99
group: ovn.openstack.org
@@ -94,11 +94,9 @@ spec:
9494
Claims lists the names of resources, defined in spec.resourceClaims,
9595
that are used by this container.
9696
97-
9897
This is an alpha field and requires enabling the
9998
DynamicResourceAllocation feature gate.
10099
101-
102100
This field is immutable. It can only be set for containers.
103101
items:
104102
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -109,6 +107,12 @@ spec:
109107
the Pod where this field is used. It makes that resource available
110108
inside a container.
111109
type: string
110+
request:
111+
description: |-
112+
Request is the name chosen for a request in the referenced claim.
113+
If empty, everything from the claim is made available, otherwise
114+
only the result of this request.
115+
type: string
112116
required:
113117
- name
114118
type: object

‎api/go.mod‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,19 @@ require (
88
github.com/onsi/gomega v1.34.1
99
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250909143828-e33d35ffd64f
1010
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250823121217-7e1cd2e3dd03
11-
k8s.io/api v0.29.15
12-
k8s.io/apimachinery v0.29.15
13-
sigs.k8s.io/controller-runtime v0.17.6
11+
k8s.io/api v0.31.12
12+
k8s.io/apimachinery 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-openapi/jsonpointer v0.21.0 // indirect
2425
github.com/go-openapi/jsonreference v0.21.0 // indirect
2526
github.com/go-openapi/swag v0.23.0 // indirect
@@ -39,33 +40,32 @@ require (
3940
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4041
github.com/openshift/api v3.9.0+incompatible // indirect
4142
github.com/pkg/errors v0.9.1 // indirect
42-
github.com/prometheus/client_golang v1.19.0 // indirect
43-
github.com/prometheus/client_model v0.6.0 // indirect
44-
github.com/prometheus/common v0.51.1 // indirect
45-
github.com/prometheus/procfs v0.13.0 // indirect
43+
github.com/prometheus/client_golang v1.19.1 // indirect
44+
github.com/prometheus/client_model v0.6.1 // indirect
45+
github.com/prometheus/common v0.55.0 // indirect
46+
github.com/prometheus/procfs v0.15.1 // indirect
4647
github.com/spf13/pflag v1.0.5 // indirect
48+
github.com/x448/float16 v0.8.4 // indirect
4749
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
4850
golang.org/x/net v0.28.0 // indirect
49-
golang.org/x/oauth2 v0.18.0 // indirect
51+
golang.org/x/oauth2 v0.21.0 // indirect
5052
golang.org/x/sys v0.23.0 // indirect
5153
golang.org/x/term v0.23.0 // indirect
5254
golang.org/x/text v0.17.0 // indirect
5355
golang.org/x/time v0.5.0 // indirect
5456
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
55-
google.golang.org/appengine v1.6.8 // indirect
56-
google.golang.org/protobuf v1.34.1 // indirect
57+
google.golang.org/protobuf v1.34.2 // indirect
5758
gopkg.in/inf.v0 v0.9.1 // indirect
5859
gopkg.in/yaml.v2 v2.4.0 // indirect
5960
gopkg.in/yaml.v3 v3.0.1 // indirect
60-
k8s.io/apiextensions-apiserver v0.29.15 // indirect
61-
k8s.io/client-go v0.29.15 // indirect
62-
k8s.io/component-base v0.29.15 // indirect
63-
k8s.io/klog/v2 v2.120.1 // indirect
61+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
62+
k8s.io/client-go v0.31.12 // indirect
63+
k8s.io/klog/v2 v2.130.1 // indirect
6464
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
65-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
65+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
6666
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
6767
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
6868
sigs.k8s.io/yaml v1.4.0 // indirect
6969
)
7070

71-
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094 //allow-merging
71+
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e //allow-merging

0 commit comments

Comments
 (0)