Skip to content

Commit d8858a6

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.0, setup-envtest@latest Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
1 parent 28e041c commit d8858a6

10 files changed

Lines changed: 465 additions & 352 deletions

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ OPERATOR_SDK_VERSION ?= v1.31.0
5656
DEFAULT_IMG ?= quay.io/openstack-k8s-operators/glance-operator:latest
5757
IMG ?= $(DEFAULT_IMG)
5858
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
59-
ENVTEST_K8S_VERSION = 1.29
59+
ENVTEST_K8S_VERSION = 1.31
6060
GINKGO ?= $(LOCALBIN)/ginkgo
6161

6262
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
@@ -227,7 +227,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
227227

228228
## Tool Versions
229229
KUSTOMIZE_VERSION ?= v3.8.7
230-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
230+
CONTROLLER_TOOLS_VERSION ?= v0.18.0
231231
GOTOOLCHAIN_VERSION ?= go1.24.0
232232

233233
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
@@ -249,7 +249,7 @@ $(CONTROLLER_GEN): $(LOCALBIN)
249249
.PHONY: envtest
250250
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
251251
$(ENVTEST): $(LOCALBIN)
252-
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@c7e1dc9b
252+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
253253

254254
.PHONY: operator-sdk
255255
OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk

‎api/bases/glance.openstack.org_glanceapis.yaml‎

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

‎api/bases/glance.openstack.org_glances.yaml‎

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

‎api/go.mod‎

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

1515
require (
1616
github.com/beorn7/perks v1.0.1 // indirect
17-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
17+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
1818
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
1919
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
2020
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
2121
github.com/fsnotify/fsnotify v1.7.0 // indirect
22+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
2223
github.com/go-logr/logr v1.4.3 // indirect
2324
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2425
github.com/go-openapi/jsonreference v0.21.0 // indirect
@@ -38,35 +39,34 @@ require (
3839
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3940
github.com/openshift/api v3.9.0+incompatible // indirect
4041
github.com/pkg/errors v0.9.1 // indirect
41-
github.com/prometheus/client_golang v1.19.0 // indirect
42-
github.com/prometheus/client_model v0.6.0 // indirect
43-
github.com/prometheus/common v0.51.1 // indirect
44-
github.com/prometheus/procfs v0.13.0 // indirect
42+
github.com/prometheus/client_golang v1.19.1 // indirect
43+
github.com/prometheus/client_model v0.6.1 // indirect
44+
github.com/prometheus/common v0.55.0 // indirect
45+
github.com/prometheus/procfs v0.15.1 // indirect
4546
github.com/spf13/pflag v1.0.5 // 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.12 // 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
6868
)
6969

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

0 commit comments

Comments
 (0)