Skip to content

Commit 1b370ed

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 f46d208 commit 1b370ed

14 files changed

Lines changed: 143 additions & 311 deletions

‎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/swift-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.0
57+
ENVTEST_K8S_VERSION = 1.31
5858

5959
# Set minimum Go version
6060
GOTOOLCHAIN_VERSION ?= go1.24.0
@@ -197,7 +197,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
197197

198198
## Tool Versions
199199
KUSTOMIZE_VERSION ?= v3.8.7
200-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
200+
CONTROLLER_TOOLS_VERSION ?= v0.18.0
201201

202202
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
203203
.PHONY: kustomize
@@ -218,7 +218,7 @@ $(CONTROLLER_GEN): $(LOCALBIN)
218218
.PHONY: envtest
219219
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
220220
$(ENVTEST): $(LOCALBIN)
221-
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@c7e1dc9b
221+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
222222

223223
.PHONY: ginkgo
224224
ginkgo: $(GINKGO) ## Download ginkgo locally if necessary.

‎api/bases/swift.openstack.org_swiftproxies.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: swiftproxies.swift.openstack.org
88
spec:
99
group: swift.openstack.org

‎api/bases/swift.openstack.org_swiftrings.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: swiftrings.swift.openstack.org
88
spec:
99
group: swift.openstack.org

‎api/bases/swift.openstack.org_swifts.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: swifts.swift.openstack.org
88
spec:
99
group: swift.openstack.org

‎api/bases/swift.openstack.org_swiftstorages.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: swiftstorages.swift.openstack.org
88
spec:
99
group: swift.openstack.org

‎api/go.mod‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,20 @@ require (
77
github.com/onsi/gomega v1.34.1
88
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250813063935-fdc20530dcf1
99
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250730071847-837b07f8d72f
10-
k8s.io/api v0.29.15
11-
k8s.io/apimachinery v0.29.15
12-
k8s.io/client-go v0.29.15
13-
sigs.k8s.io/controller-runtime v0.17.6
10+
k8s.io/api v0.31.12
11+
k8s.io/apimachinery v0.31.12
12+
k8s.io/client-go 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-logr/logr v1.4.3 // indirect
2425
github.com/go-logr/zapr v1.3.0 // indirect
2526
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -42,39 +43,36 @@ require (
4243
github.com/modern-go/reflect2 v1.0.2 // indirect
4344
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4445
github.com/pkg/errors v0.9.1 // indirect
45-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
46-
github.com/prometheus/client_golang v1.19.0 // indirect
47-
github.com/prometheus/client_model v0.6.0 // indirect
48-
github.com/prometheus/common v0.51.1 // indirect
49-
github.com/prometheus/procfs v0.13.0 // indirect
50-
github.com/rogpeppe/go-internal v1.12.0 // indirect
46+
github.com/prometheus/client_golang v1.19.1 // indirect
47+
github.com/prometheus/client_model v0.6.1 // indirect
48+
github.com/prometheus/common v0.55.0 // indirect
49+
github.com/prometheus/procfs v0.15.1 // indirect
5150
github.com/spf13/pflag v1.0.5 // indirect
51+
github.com/x448/float16 v0.8.4 // indirect
5252
go.uber.org/multierr v1.11.0 // indirect
5353
go.uber.org/zap v1.27.0 // indirect
5454
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
5555
golang.org/x/net v0.28.0 // indirect
56-
golang.org/x/oauth2 v0.18.0 // indirect
56+
golang.org/x/oauth2 v0.21.0 // indirect
5757
golang.org/x/sys v0.23.0 // indirect
5858
golang.org/x/term v0.23.0 // indirect
5959
golang.org/x/text v0.17.0 // indirect
6060
golang.org/x/time v0.5.0 // indirect
6161
golang.org/x/tools v0.24.0 // indirect
6262
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
63-
google.golang.org/appengine v1.6.8 // indirect
64-
google.golang.org/protobuf v1.34.1 // indirect
63+
google.golang.org/protobuf v1.34.2 // indirect
6564
gopkg.in/inf.v0 v0.9.1 // indirect
6665
gopkg.in/yaml.v2 v2.4.0 // indirect
6766
gopkg.in/yaml.v3 v3.0.1 // indirect
68-
k8s.io/apiextensions-apiserver v0.29.15 // indirect
69-
k8s.io/component-base v0.29.15 // indirect
70-
k8s.io/klog/v2 v2.120.1 // indirect
67+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
68+
k8s.io/klog/v2 v2.130.1 // indirect
7169
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
72-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
70+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
7371
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7472
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
7573
sigs.k8s.io/yaml v1.4.0 // indirect
7674
)
7775

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

0 commit comments

Comments
 (0)