Skip to content

Commit dd2fbf6

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 <[email protected]>
1 parent 8863914 commit dd2fbf6

14 files changed

+833
-434
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/test-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))
@@ -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
GOTOOLCHAIN_VERSION ?= go1.24.0
207207

208208
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
@@ -224,7 +224,7 @@ $(CONTROLLER_GEN): $(LOCALBIN)
224224
.PHONY: envtest
225225
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
226226
$(ENVTEST): $(LOCALBIN)
227-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@c7e1dc9b
227+
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
228228

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

api/bases/test.openstack.org_ansibletests.yaml

Lines changed: 91 additions & 24 deletions
Large diffs are not rendered by default.

api/bases/test.openstack.org_horizontests.yaml

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

api/bases/test.openstack.org_tempests.yaml

Lines changed: 91 additions & 24 deletions
Large diffs are not rendered by default.

api/bases/test.openstack.org_tobikoes.yaml

Lines changed: 91 additions & 24 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/google/go-cmp v0.7.0
77
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250823121217-7e1cd2e3dd03
88
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250823121217-7e1cd2e3dd03
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
@@ -36,30 +37,29 @@ require (
3637
github.com/modern-go/reflect2 v1.0.2 // indirect
3738
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3839
github.com/pkg/errors v0.9.1 // indirect
39-
github.com/prometheus/client_golang v1.19.0 // indirect
40-
github.com/prometheus/client_model v0.6.0 // indirect
41-
github.com/prometheus/common v0.51.1 // indirect
42-
github.com/prometheus/procfs v0.13.0 // indirect
40+
github.com/prometheus/client_golang v1.19.1 // indirect
41+
github.com/prometheus/client_model v0.6.1 // indirect
42+
github.com/prometheus/common v0.55.0 // indirect
43+
github.com/prometheus/procfs v0.15.1 // indirect
4344
github.com/spf13/pflag v1.0.5 // indirect
45+
github.com/x448/float16 v0.8.4 // indirect
4446
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
4547
golang.org/x/net v0.28.0 // indirect
46-
golang.org/x/oauth2 v0.18.0 // indirect
48+
golang.org/x/oauth2 v0.21.0 // indirect
4749
golang.org/x/sys v0.23.0 // indirect
4850
golang.org/x/term v0.23.0 // indirect
4951
golang.org/x/text v0.17.0 // indirect
5052
golang.org/x/time v0.5.0 // indirect
5153
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
52-
google.golang.org/appengine v1.6.8 // indirect
53-
google.golang.org/protobuf v1.34.1 // indirect
54+
google.golang.org/protobuf v1.34.2 // indirect
5455
gopkg.in/inf.v0 v0.9.1 // indirect
5556
gopkg.in/yaml.v2 v2.4.0 // indirect
5657
gopkg.in/yaml.v3 v3.0.1 // indirect
57-
k8s.io/apiextensions-apiserver v0.29.15 // indirect
58-
k8s.io/client-go v0.29.15 // indirect
59-
k8s.io/component-base v0.29.15 // indirect
60-
k8s.io/klog/v2 v2.120.1 // indirect
58+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
59+
k8s.io/client-go v0.31.12 // indirect
60+
k8s.io/klog/v2 v2.130.1 // indirect
6161
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
62-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
62+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
6363
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
6464
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
6565
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/test.openstack.org_ansibletests.yaml

Lines changed: 91 additions & 24 deletions
Large diffs are not rendered by default.

config/crd/bases/test.openstack.org_horizontests.yaml

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

config/crd/bases/test.openstack.org_tempests.yaml

Lines changed: 91 additions & 24 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)