Skip to content

Commit 41ea060

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 2b8bd6b commit 41ea060

8 files changed

Lines changed: 288 additions & 254 deletions

File tree

‎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/horizon-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
# Set minimum Go version
6060
GOTOOLCHAIN_VERSION ?= go1.24.0
@@ -202,7 +202,7 @@ GINKGO ?= $(LOCALBIN)/ginkgo
202202

203203
## Tool Versions
204204
KUSTOMIZE_VERSION ?= v3.8.7
205-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
205+
CONTROLLER_TOOLS_VERSION ?= v0.18.0
206206

207207
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
208208
.PHONY: kustomize $(KUSTOMIZE)
@@ -223,7 +223,7 @@ $(CONTROLLER_GEN): $(LOCALBIN)
223223
.PHONY: envtest
224224
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
225225
$(ENVTEST): $(LOCALBIN)
226-
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@c7e1dc9b
226+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
227227

228228
.PHONY: ginkgo
229229
ginkgo: $(GINKGO) ## Download ginkgo locally if necessary.

‎api/bases/horizon.openstack.org_horizons.yaml‎

Lines changed: 85 additions & 23 deletions
Large diffs are not rendered by default.

‎api/go.mod‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@ require (
66
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250813063935-fdc20530dcf1
77
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250730071847-837b07f8d72f
88
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250730071847-837b07f8d72f
9-
k8s.io/api v0.29.15
10-
k8s.io/apimachinery v0.29.15
11-
sigs.k8s.io/controller-runtime v0.17.6
9+
k8s.io/api v0.31.12
10+
k8s.io/apimachinery v0.31.12
11+
sigs.k8s.io/controller-runtime v0.19.7
1212
)
1313

1414
require (
1515
github.com/beorn7/perks v1.0.1 // indirect
16-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
16+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
1717
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
1818
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
1919
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
2020
github.com/fsnotify/fsnotify v1.7.0 // indirect
21+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
2122
github.com/go-logr/logr v1.4.3 // indirect
2223
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2324
github.com/go-openapi/jsonreference v0.21.0 // indirect
@@ -37,31 +38,30 @@ require (
3738
github.com/modern-go/reflect2 v1.0.2 // indirect
3839
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3940
github.com/pkg/errors v0.9.1 // indirect
40-
github.com/prometheus/client_golang v1.19.0 // indirect
41-
github.com/prometheus/client_model v0.6.0 // indirect
42-
github.com/prometheus/common v0.51.1 // indirect
43-
github.com/prometheus/procfs v0.13.0 // indirect
41+
github.com/prometheus/client_golang v1.19.1 // indirect
42+
github.com/prometheus/client_model v0.6.1 // indirect
43+
github.com/prometheus/common v0.55.0 // indirect
44+
github.com/prometheus/procfs v0.15.1 // indirect
4445
github.com/spf13/pflag v1.0.5 // indirect
4546
github.com/stretchr/testify v1.10.0 // indirect
47+
github.com/x448/float16 v0.8.4 // indirect
4648
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
4749
golang.org/x/net v0.28.0 // indirect
48-
golang.org/x/oauth2 v0.18.0 // indirect
50+
golang.org/x/oauth2 v0.21.0 // indirect
4951
golang.org/x/sys v0.23.0 // indirect
5052
golang.org/x/term v0.23.0 // indirect
5153
golang.org/x/text v0.17.0 // indirect
5254
golang.org/x/time v0.5.0 // indirect
5355
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
54-
google.golang.org/appengine v1.6.8 // indirect
55-
google.golang.org/protobuf v1.34.1 // indirect
56+
google.golang.org/protobuf v1.34.2 // indirect
5657
gopkg.in/inf.v0 v0.9.1 // indirect
5758
gopkg.in/yaml.v2 v2.4.0 // indirect
5859
gopkg.in/yaml.v3 v3.0.1 // indirect
59-
k8s.io/apiextensions-apiserver v0.29.15 // indirect
60-
k8s.io/client-go v0.29.15 // indirect
61-
k8s.io/component-base v0.29.15 // indirect
62-
k8s.io/klog/v2 v2.120.1 // indirect
60+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
61+
k8s.io/client-go v0.31.12 // indirect
62+
k8s.io/klog/v2 v2.130.1 // indirect
6363
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
64-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
64+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
6565
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
6666
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
6767
sigs.k8s.io/yaml v1.4.0 // indirect

‎api/go.sum‎

Lines changed: 38 additions & 56 deletions
Large diffs are not rendered by default.

‎config/crd/bases/horizon.openstack.org_horizons.yaml‎

Lines changed: 85 additions & 23 deletions
Large diffs are not rendered by default.

‎config/rbac/role.yaml‎

Lines changed: 3 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ rules:
77
- apiGroups:
88
- ""
99
resources:
10+
- configmaps
1011
- pods
12+
- secrets
13+
- services
1114
verbs:
1215
- create
1316
- delete
@@ -39,42 +42,6 @@ rules:
3942
- patch
4043
- update
4144
- watch
42-
- apiGroups:
43-
- ""
44-
resources:
45-
- configmaps
46-
verbs:
47-
- create
48-
- delete
49-
- get
50-
- list
51-
- patch
52-
- update
53-
- watch
54-
- apiGroups:
55-
- ""
56-
resources:
57-
- secrets
58-
verbs:
59-
- create
60-
- delete
61-
- get
62-
- list
63-
- patch
64-
- update
65-
- watch
66-
- apiGroups:
67-
- ""
68-
resources:
69-
- services
70-
verbs:
71-
- create
72-
- delete
73-
- get
74-
- list
75-
- patch
76-
- update
77-
- watch
7845
- apiGroups:
7946
- horizon.openstack.org
8047
resources:
@@ -114,21 +81,7 @@ rules:
11481
- keystone.openstack.org
11582
resources:
11683
- keystoneapis
117-
verbs:
118-
- get
119-
- list
120-
- watch
121-
- apiGroups:
122-
- keystone.openstack.org
123-
resources:
12484
- keystoneendpoints
125-
verbs:
126-
- get
127-
- list
128-
- watch
129-
- apiGroups:
130-
- keystone.openstack.org
131-
resources:
13285
- keystoneservices
13386
verbs:
13487
- get
@@ -146,16 +99,6 @@ rules:
14699
- rbac.authorization.k8s.io
147100
resources:
148101
- rolebindings
149-
verbs:
150-
- create
151-
- get
152-
- list
153-
- patch
154-
- update
155-
- watch
156-
- apiGroups:
157-
- rbac.authorization.k8s.io
158-
resources:
159102
- roles
160103
verbs:
161104
- create

‎go.mod‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,21 @@ require (
1717
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250730071847-837b07f8d72f
1818
github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20250730071847-837b07f8d72f
1919
github.com/stretchr/testify v1.10.0
20-
k8s.io/api v0.29.15
21-
k8s.io/apimachinery v0.29.15
22-
k8s.io/client-go v0.29.15
23-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
24-
sigs.k8s.io/controller-runtime v0.17.6
20+
k8s.io/api v0.31.12
21+
k8s.io/apimachinery v0.31.12
22+
k8s.io/client-go v0.31.12
23+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
24+
sigs.k8s.io/controller-runtime v0.19.7
2525
)
2626

2727
require (
2828
github.com/beorn7/perks v1.0.1 // indirect
29-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
29+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3030
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3131
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
3232
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
3333
github.com/fsnotify/fsnotify v1.7.0 // indirect
34+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3435
github.com/go-logr/zapr v1.3.0 // indirect
3536
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3637
github.com/go-openapi/jsonreference v0.21.0 // indirect
@@ -54,42 +55,41 @@ require (
5455
github.com/openshift/api v3.9.0+incompatible // indirect
5556
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250730071847-837b07f8d72f // indirect
5657
github.com/pkg/errors v0.9.1 // indirect
57-
github.com/pmezard/go-difflib v1.0.0 // indirect
58-
github.com/prometheus/client_golang v1.19.0 // indirect
59-
github.com/prometheus/client_model v0.6.0 // indirect
60-
github.com/prometheus/common v0.51.1 // indirect
61-
github.com/prometheus/procfs v0.13.0 // indirect
58+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
59+
github.com/prometheus/client_golang v1.19.1 // indirect
60+
github.com/prometheus/client_model v0.6.1 // indirect
61+
github.com/prometheus/common v0.55.0 // indirect
62+
github.com/prometheus/procfs v0.15.1 // indirect
6263
github.com/rabbitmq/cluster-operator/v2 v2.9.0 // indirect
6364
github.com/spf13/pflag v1.0.5 // indirect
65+
github.com/x448/float16 v0.8.4 // indirect
6466
go.uber.org/multierr v1.11.0 // indirect
6567
go.uber.org/zap v1.27.0 // indirect
6668
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
6769
golang.org/x/mod v0.20.0 // indirect
6870
golang.org/x/net v0.28.0 // indirect
69-
golang.org/x/oauth2 v0.18.0 // indirect
71+
golang.org/x/oauth2 v0.21.0 // indirect
7072
golang.org/x/sys v0.23.0 // indirect
7173
golang.org/x/term v0.23.0 // indirect
7274
golang.org/x/text v0.17.0 // indirect
7375
golang.org/x/time v0.5.0 // indirect
7476
golang.org/x/tools v0.24.0 // indirect
7577
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
76-
google.golang.org/appengine v1.6.8 // indirect
77-
google.golang.org/protobuf v1.34.1 // indirect
78+
google.golang.org/protobuf v1.34.2 // indirect
7879
gopkg.in/inf.v0 v0.9.1 // indirect
7980
gopkg.in/yaml.v2 v2.4.0 // indirect
8081
gopkg.in/yaml.v3 v3.0.1 // indirect
81-
k8s.io/apiextensions-apiserver v0.29.15 // indirect
82-
k8s.io/component-base v0.29.15 // indirect
83-
k8s.io/klog/v2 v2.120.1 // indirect
82+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
83+
k8s.io/klog/v2 v2.130.1 // indirect
8484
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
8585
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
8686
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
8787
sigs.k8s.io/yaml v1.4.0 // indirect
8888
)
8989

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

9494
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.6.0_patches_tag)
9595
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d //allow-merging

0 commit comments

Comments
 (0)