Skip to content

Commit 9db39d1

Browse files
stuggiopenshift-merge-bot[bot]
authored andcommitted
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 ef2824c commit 9db39d1

File tree

8 files changed

+135
-237
lines changed

8 files changed

+135
-237
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/placement-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))
@@ -196,7 +196,7 @@ GINKGO ?= $(LOCALBIN)/ginkgo
196196

197197
## Tool Versions
198198
KUSTOMIZE_VERSION ?= v3.8.7
199-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
199+
CONTROLLER_TOOLS_VERSION ?= v0.18.0
200200

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

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

api/bases/placement.openstack.org_placementapis.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: placementapis.placement.openstack.org
88
spec:
99
group: placement.openstack.org
@@ -289,11 +289,9 @@ spec:
289289
Claims lists the names of resources, defined in spec.resourceClaims,
290290
that are used by this container.
291291
292-
293292
This is an alpha field and requires enabling the
294293
DynamicResourceAllocation feature gate.
295294
296-
297295
This field is immutable. It can only be set for containers.
298296
items:
299297
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -304,6 +302,12 @@ spec:
304302
the Pod where this field is used. It makes that resource available
305303
inside a container.
306304
type: string
305+
request:
306+
description: |-
307+
Request is the name chosen for a request in the referenced claim.
308+
If empty, everything from the claim is made available, otherwise
309+
only the result of this request.
310+
type: string
307311
required:
308312
- name
309313
type: object

api/go.mod

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@ go 1.24
55
require (
66
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250821143610-c8ef7b9a21ec
77
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250730071847-837b07f8d72f
8-
k8s.io/api v0.29.15
9-
k8s.io/apimachinery v0.29.15
10-
sigs.k8s.io/controller-runtime v0.17.6
8+
k8s.io/api v0.31.12
9+
k8s.io/apimachinery v0.31.12
10+
sigs.k8s.io/controller-runtime v0.19.7
1111
)
1212

1313
require (
1414
github.com/beorn7/perks v1.0.1 // indirect
15-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
15+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
1616
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
1717
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
1818
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
1919
github.com/fsnotify/fsnotify v1.7.0 // indirect
20+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
2021
github.com/go-logr/logr v1.4.3 // indirect
2122
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2223
github.com/go-openapi/jsonreference v0.21.0 // indirect
@@ -36,35 +37,34 @@ 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
6666
)
6767

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

0 commit comments

Comments
 (0)