Skip to content

Commit 4a5cc82

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 Drops Required kubebuilder tag from inlined struct types since with controller-utils 0.18 it will result in adding empty string to the required list of the CRD. Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
1 parent 3fd572e commit 4a5cc82

11 files changed

Lines changed: 150 additions & 274 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/openstack-baremetal-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

6161
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
6262
ifeq (,$(shell go env GOBIN))
@@ -219,7 +219,7 @@ GINKGO ?= $(LOCALBIN)/ginkgo
219219

220220
## Tool Versions
221221
KUSTOMIZE_VERSION ?= v3.8.7
222-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
222+
CONTROLLER_TOOLS_VERSION ?= v0.18.0
223223

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

245245
.PHONY: operator-sdk
246246
OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk

api/bases/baremetal.openstack.org_openstackbaremetalsets.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: openstackbaremetalsets.baremetal.openstack.org
88
spec:
99
group: baremetal.openstack.org

api/bases/baremetal.openstack.org_openstackprovisionservers.yaml

Lines changed: 7 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: openstackprovisionservers.baremetal.openstack.org
88
spec:
99
group: baremetal.openstack.org
@@ -104,11 +104,9 @@ spec:
104104
Claims lists the names of resources, defined in spec.resourceClaims,
105105
that are used by this container.
106106
107-
108107
This is an alpha field and requires enabling the
109108
DynamicResourceAllocation feature gate.
110109
111-
112110
This field is immutable. It can only be set for containers.
113111
items:
114112
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -119,6 +117,12 @@ spec:
119117
the Pod where this field is used. It makes that resource available
120118
inside a container.
121119
type: string
120+
request:
121+
description: |-
122+
Request is the name chosen for a request in the referenced claim.
123+
If empty, everything from the claim is made available, otherwise
124+
only the result of this request.
125+
type: string
122126
required:
123127
- name
124128
type: object

api/go.mod

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,19 @@ require (
99
github.com/onsi/ginkgo/v2 v2.20.1
1010
github.com/onsi/gomega v1.34.1
1111
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250730071847-837b07f8d72f
12-
k8s.io/api v0.29.15
13-
k8s.io/apimachinery v0.29.15
14-
sigs.k8s.io/controller-runtime v0.17.6
12+
k8s.io/api v0.31.12
13+
k8s.io/apimachinery 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/gabriel-vasile/mimetype v1.4.8 // indirect
2526
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2627
github.com/go-openapi/jsonreference v0.21.0 // indirect
@@ -46,37 +47,36 @@ require (
4647
github.com/modern-go/reflect2 v1.0.2 // indirect
4748
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4849
github.com/pkg/errors v0.9.1 // indirect
49-
github.com/prometheus/client_golang v1.19.0 // indirect
50-
github.com/prometheus/client_model v0.6.0 // indirect
51-
github.com/prometheus/common v0.51.1 // indirect
52-
github.com/prometheus/procfs v0.13.0 // indirect
50+
github.com/prometheus/client_golang v1.19.1 // indirect
51+
github.com/prometheus/client_model v0.6.1 // indirect
52+
github.com/prometheus/common v0.55.0 // indirect
53+
github.com/prometheus/procfs v0.15.1 // indirect
5354
github.com/spf13/pflag v1.0.5 // indirect
55+
github.com/x448/float16 v0.8.4 // indirect
5456
golang.org/x/crypto v0.33.0 // indirect
5557
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
5658
golang.org/x/net v0.34.0 // indirect
57-
golang.org/x/oauth2 v0.18.0 // indirect
59+
golang.org/x/oauth2 v0.21.0 // indirect
5860
golang.org/x/sys v0.30.0 // indirect
5961
golang.org/x/term v0.29.0 // indirect
6062
golang.org/x/text v0.22.0 // indirect
6163
golang.org/x/time v0.5.0 // indirect
6264
golang.org/x/tools v0.24.0 // indirect
6365
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
66+
google.golang.org/protobuf v1.34.2 // indirect
6667
gopkg.in/inf.v0 v0.9.1 // indirect
6768
gopkg.in/yaml.v2 v2.4.0 // indirect
6869
gopkg.in/yaml.v3 v3.0.1 // indirect
69-
k8s.io/apiextensions-apiserver v0.29.15 // indirect
70-
k8s.io/client-go v0.29.15 // indirect
71-
k8s.io/component-base v0.29.15 // indirect
72-
k8s.io/klog/v2 v2.120.1 // indirect
70+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
71+
k8s.io/client-go v0.31.12 // indirect
72+
k8s.io/klog/v2 v2.130.1 // indirect
7373
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
74-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
74+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
7575
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7676
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
7777
sigs.k8s.io/yaml v1.4.0 // indirect
7878
)
7979

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

0 commit comments

Comments
 (0)