Skip to content

Commit ab96221

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 3ea6568 commit ab96221

12 files changed

+155
-300
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/mariadb-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))
@@ -215,7 +215,7 @@ GINKGO ?= $(LOCALBIN)/ginkgo
215215

216216
## Tool Versions
217217
KUSTOMIZE_VERSION ?= v3.8.7
218-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
218+
CONTROLLER_TOOLS_VERSION ?= v0.18.0
219219
GOTOOLCHAIN_VERSION ?= go1.24.0
220220

221221
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
@@ -237,7 +237,7 @@ $(CONTROLLER_GEN): $(LOCALBIN)
237237
.PHONY: envtest
238238
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
239239
$(ENVTEST): $(LOCALBIN)
240-
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@c7e1dc9b
240+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
241241

242242
.PHONY: ginkgo
243243
ginkgo: $(GINKGO) ## Download ginkgo locally if necessary.

‎api/bases/mariadb.openstack.org_galeras.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: galeras.mariadb.openstack.org
88
spec:
99
group: mariadb.openstack.org
@@ -86,11 +86,9 @@ spec:
8686
Claims lists the names of resources, defined in spec.resourceClaims,
8787
that are used by this container.
8888
89-
9089
This is an alpha field and requires enabling the
9190
DynamicResourceAllocation feature gate.
9291
93-
9492
This field is immutable. It can only be set for containers.
9593
items:
9694
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -101,6 +99,12 @@ spec:
10199
the Pod where this field is used. It makes that resource available
102100
inside a container.
103101
type: string
102+
request:
103+
description: |-
104+
Request is the name chosen for a request in the referenced claim.
105+
If empty, everything from the claim is made available, otherwise
106+
only the result of this request.
107+
type: string
104108
required:
105109
- name
106110
type: object

‎api/bases/mariadb.openstack.org_mariadbaccounts.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: mariadbaccounts.mariadb.openstack.org
88
spec:
99
group: mariadb.openstack.org

‎api/bases/mariadb.openstack.org_mariadbdatabases.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: mariadbdatabases.mariadb.openstack.org
88
spec:
99
group: mariadb.openstack.org

‎api/go.mod‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,21 @@ require (
88
github.com/onsi/gomega v1.34.1
99
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250821143610-c8ef7b9a21ec
1010
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250730071847-837b07f8d72f
11-
k8s.io/api v0.29.15
12-
k8s.io/apimachinery v0.29.15
13-
k8s.io/client-go v0.29.15
14-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
15-
sigs.k8s.io/controller-runtime v0.17.6
11+
k8s.io/api v0.31.12
12+
k8s.io/apimachinery v0.31.12
13+
k8s.io/client-go v0.31.12
14+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
15+
sigs.k8s.io/controller-runtime v0.19.7
1616
)
1717

1818
require (
1919
github.com/beorn7/perks v1.0.1 // indirect
20-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
20+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2121
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2222
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
2323
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
2424
github.com/fsnotify/fsnotify v1.7.0 // indirect
25+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
2526
github.com/go-logr/zapr v1.3.0 // indirect
2627
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2728
github.com/go-openapi/jsonreference v0.21.0 // indirect
@@ -45,36 +46,35 @@ require (
4546
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4647
github.com/openshift/api v3.9.0+incompatible // indirect
4748
github.com/pkg/errors v0.9.1 // indirect
48-
github.com/prometheus/client_golang v1.19.0 // indirect
49-
github.com/prometheus/client_model v0.6.0 // indirect
50-
github.com/prometheus/common v0.51.1 // indirect
51-
github.com/prometheus/procfs v0.13.0 // indirect
49+
github.com/prometheus/client_golang v1.19.1 // indirect
50+
github.com/prometheus/client_model v0.6.1 // indirect
51+
github.com/prometheus/common v0.55.0 // indirect
52+
github.com/prometheus/procfs v0.15.1 // indirect
5253
github.com/spf13/pflag v1.0.5 // indirect
54+
github.com/x448/float16 v0.8.4 // indirect
5355
go.uber.org/multierr v1.11.0 // indirect
5456
go.uber.org/zap v1.27.0 // indirect
5557
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
5658
golang.org/x/net v0.28.0 // indirect
57-
golang.org/x/oauth2 v0.18.0 // indirect
59+
golang.org/x/oauth2 v0.21.0 // indirect
5860
golang.org/x/sys v0.23.0 // indirect
5961
golang.org/x/term v0.23.0 // indirect
6062
golang.org/x/text v0.17.0 // indirect
6163
golang.org/x/time v0.5.0 // indirect
6264
golang.org/x/tools v0.24.0 // indirect
6365
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
64-
google.golang.org/appengine v1.6.8 // indirect
65-
google.golang.org/protobuf v1.34.1 // indirect
66+
google.golang.org/protobuf v1.34.2 // indirect
6667
gopkg.in/inf.v0 v0.9.1 // indirect
6768
gopkg.in/yaml.v2 v2.4.0 // indirect
6869
gopkg.in/yaml.v3 v3.0.1 // indirect
69-
k8s.io/apiextensions-apiserver v0.29.15 // indirect
70-
k8s.io/component-base v0.29.15 // indirect
71-
k8s.io/klog/v2 v2.120.1 // indirect
70+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
71+
k8s.io/klog/v2 v2.130.1 // indirect
7272
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
7373
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7474
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
7575
sigs.k8s.io/yaml v1.4.0 // indirect
7676
)
7777

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

0 commit comments

Comments
 (0)