Skip to content

Commit c9cc6df

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 5bbee53 commit c9cc6df

17 files changed

+449
-558
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/telemetry-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))
@@ -198,7 +198,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
198198

199199
## Tool Versions
200200
KUSTOMIZE_VERSION ?= v3.8.7
201-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
201+
CONTROLLER_TOOLS_VERSION ?= v0.18.0
202202
GOTOOLCHAIN_VERSION ?= go1.24.0
203203

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

225225
.PHONY: operator-sdk
226226
OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk

api/bases/telemetry.openstack.org_autoscalings.yaml

Lines changed: 5 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: autoscalings.telemetry.openstack.org
88
spec:
99
group: telemetry.openstack.org
@@ -95,7 +95,6 @@ spec:
9595
description: |-
9696
ConfigOverwrite - interface to overwrite default config files like e.g. logging.conf or policy.json.
9797
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
98-
TODO: -> implement
9998
type: object
10099
evaluatorImage:
101100
type: string
@@ -395,10 +394,13 @@ spec:
395394
valid secret key.
396395
type: string
397396
name:
397+
default: ""
398398
description: |-
399399
Name of the referent.
400+
This field is effectively required, but due to backwards compatibility is
401+
allowed to be empty. Instances of this type with an empty value here are
402+
almost certainly wrong.
400403
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
401-
TODO: Add other useful fields. apiVersion, kind, uid?
402404
type: string
403405
optional:
404406
description: Specify whether the Secret or its key must be defined

api/bases/telemetry.openstack.org_ceilometers.yaml

Lines changed: 1 addition & 2 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: ceilometers.telemetry.openstack.org
88
spec:
99
group: telemetry.openstack.org
@@ -133,7 +133,6 @@ spec:
133133
description: |-
134134
ConfigOverwrite - interface to overwrite default config files like e.g. logging.conf or policy.json.
135135
But can also be used to add additional files. Those get added to the service config dir in /etc/<service> .
136-
TODO: -> implement
137136
type: object
138137
ipmiImage:
139138
type: string

api/bases/telemetry.openstack.org_loggings.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: loggings.telemetry.openstack.org
88
spec:
99
group: telemetry.openstack.org

api/bases/telemetry.openstack.org_metricstorages.yaml

Lines changed: 74 additions & 44 deletions
Large diffs are not rendered by default.

api/bases/telemetry.openstack.org_telemetries.yaml

Lines changed: 78 additions & 47 deletions
Large diffs are not rendered by default.

api/go.mod

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,20 @@ require (
88
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250802211136-f5a38d83e342
99
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250730071847-837b07f8d72f
1010
github.com/rhobs/observability-operator v0.3.1
11-
k8s.io/api v0.29.15
12-
k8s.io/apimachinery v0.29.15
13-
k8s.io/client-go v0.29.15
14-
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+
sigs.k8s.io/controller-runtime v0.19.7
1515
)
1616

1717
require (
1818
github.com/beorn7/perks v1.0.1 // indirect
19-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
19+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2020
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2121
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
2222
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
2323
github.com/fsnotify/fsnotify v1.7.0 // indirect
24+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
2425
github.com/go-logr/logr v1.4.3 // indirect
2526
github.com/go-logr/zapr v1.3.0 // indirect
2627
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -43,34 +44,32 @@ require (
4344
github.com/modern-go/reflect2 v1.0.2 // indirect
4445
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4546
github.com/pkg/errors v0.9.1 // 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.53.0 // indirect
49-
github.com/prometheus/procfs v0.13.0 // indirect
47+
github.com/prometheus/client_golang v1.19.1 // indirect
48+
github.com/prometheus/client_model v0.6.1 // indirect
49+
github.com/prometheus/common v0.55.0 // indirect
50+
github.com/prometheus/procfs v0.15.1 // indirect
5051
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1 // indirect
51-
github.com/rogpeppe/go-internal v1.12.0 // indirect
5252
github.com/spf13/pflag v1.0.5 // indirect
53+
github.com/x448/float16 v0.8.4 // indirect
5354
go.uber.org/multierr v1.11.0 // indirect
5455
go.uber.org/zap v1.27.0 // indirect
5556
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
5657
golang.org/x/net v0.28.0 // indirect
57-
golang.org/x/oauth2 v0.18.0 // indirect
58+
golang.org/x/oauth2 v0.21.0 // indirect
5859
golang.org/x/sys v0.23.0 // indirect
5960
golang.org/x/term v0.23.0 // indirect
6061
golang.org/x/text v0.17.0 // indirect
6162
golang.org/x/time v0.5.0 // indirect
6263
golang.org/x/tools v0.24.0 // indirect
6364
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
65+
google.golang.org/protobuf v1.34.2 // indirect
6666
gopkg.in/inf.v0 v0.9.1 // indirect
6767
gopkg.in/yaml.v2 v2.4.0 // indirect
6868
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
69+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
70+
k8s.io/klog/v2 v2.130.1 // indirect
7271
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
73-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
72+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
7473
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7574
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
7675
sigs.k8s.io/yaml v1.4.0 // indirect

0 commit comments

Comments
 (0)