Skip to content

Commit 63fefd2

Browse files
stuggiclaude
stuggi
and
claude
committed
Bump dependencies for OCP 4.20
- k8s.io/*: v0.31.14 -> v0.33.13 - controller-runtime: v0.19.7 -> v0.21.0 - openshift/api: release-4.18 -> release-4.20 - ENVTEST_K8S_VERSION: 1.31 -> 1.33 - CRD_SCHEMA_CHECKER_VERSION: release-4.16 -> release-4.18 Depends-On: openstack-k8s-operators/lib-common#717 Jira: OSPRH-32989 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
1 parent fe962fc commit 63fefd2

14 files changed

Lines changed: 330 additions & 276 deletions

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ OPERATOR_SDK_VERSION ?= v1.42.3
5454
DEFAULT_IMG ?= quay.io/openstack-k8s-operators/nova-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.31
57+
ENVTEST_K8S_VERSION = 1.33
5858

5959
SETUP_ENVTEST_VERSION ?= release-0.22
6060
CATALOG_IMAGE ?= quay.io/openstack-k8s-operators/nova-operator-index:latest
@@ -435,7 +435,7 @@ kuttl-test-cleanup:
435435
echo "Namespace already cleaned up. Nothing to do"; \
436436
fi
437437

438-
CRD_SCHEMA_CHECKER_VERSION ?= release-4.16
438+
CRD_SCHEMA_CHECKER_VERSION ?= release-4.18
439439
BRANCH ?= main
440440
.PHONY: force-bump
441441
force-bump: ## Force bump operator and lib-common dependencies

‎api/go.mod‎

Lines changed: 43 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,44 @@ go 1.26.3
44

55
require (
66
github.com/google/go-cmp v0.7.0
7-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260629124631-33e3b7eda748
8-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260713090837-13a3b65580c3
7+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260717091754-2c13031ef562
8+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260717092345-ab1ee7b97c67
99
github.com/robfig/cron/v3 v3.0.1
10-
k8s.io/api v0.31.14
11-
k8s.io/apimachinery v0.31.14
12-
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
13-
sigs.k8s.io/controller-runtime v0.19.7
10+
k8s.io/api v0.33.13
11+
k8s.io/apimachinery v0.33.13
12+
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
13+
sigs.k8s.io/controller-runtime v0.21.0
1414
)
1515

1616
require (
1717
github.com/beorn7/perks v1.0.1 // indirect
1818
github.com/cespare/xxhash/v2 v2.3.0 // indirect
1919
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
20-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
20+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
2121
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
2222
github.com/fsnotify/fsnotify v1.9.0 // indirect
2323
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
2424
github.com/go-logr/logr v1.4.3 // indirect
2525
github.com/go-openapi/jsonpointer v0.21.1 // indirect
2626
github.com/go-openapi/jsonreference v0.21.0 // indirect
27-
github.com/go-openapi/swag v0.23.1 // indirect
27+
github.com/go-openapi/swag v0.25.4 // indirect
28+
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
29+
github.com/go-openapi/swag/conv v0.25.4 // indirect
30+
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
31+
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
32+
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
33+
github.com/go-openapi/swag/loading v0.25.4 // indirect
34+
github.com/go-openapi/swag/mangling v0.25.4 // indirect
35+
github.com/go-openapi/swag/netutils v0.25.4 // indirect
36+
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
37+
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
38+
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
2839
github.com/gogo/protobuf v1.3.2 // indirect
29-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
30-
github.com/golang/protobuf v1.5.4 // indirect
40+
github.com/google/btree v1.1.3 // indirect
3141
github.com/google/gnostic-models v0.7.0 // indirect
32-
github.com/google/gofuzz v1.2.0 // indirect
3342
github.com/google/uuid v1.6.0 // indirect
34-
github.com/imdario/mergo v0.3.16 // indirect
35-
github.com/josharian/intern v1.0.0 // indirect
3643
github.com/json-iterator/go v1.1.12 // indirect
37-
github.com/mailru/easyjson v0.9.0 // indirect
44+
github.com/kr/text v0.2.0 // indirect
3845
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3946
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
4047
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -43,51 +50,50 @@ require (
4350
github.com/prometheus/client_model v0.6.2 // indirect
4451
github.com/prometheus/common v0.65.0 // indirect
4552
github.com/prometheus/procfs v0.16.1 // indirect
46-
github.com/rogpeppe/go-internal v1.13.1 // indirect
47-
github.com/spf13/pflag v1.0.9 // indirect
53+
github.com/spf13/pflag v1.0.10 // indirect
4854
github.com/x448/float16 v0.8.4 // indirect
49-
go.yaml.in/yaml/v2 v2.4.2 // indirect
55+
go.yaml.in/yaml/v2 v2.4.3 // indirect
5056
go.yaml.in/yaml/v3 v3.0.4 // indirect
51-
golang.org/x/exp v0.0.0-20260611194520-c48552f49976 // indirect
5257
golang.org/x/net v0.56.0 // indirect
5358
golang.org/x/oauth2 v0.30.0 // indirect
54-
golang.org/x/sys v0.46.0 // indirect
55-
golang.org/x/term v0.44.0 // indirect
56-
golang.org/x/text v0.38.0 // indirect
59+
golang.org/x/sync v0.22.0 // indirect
60+
golang.org/x/sys v0.47.0 // indirect
61+
golang.org/x/term v0.45.0 // indirect
62+
golang.org/x/text v0.40.0 // indirect
5763
golang.org/x/time v0.12.0 // indirect
5864
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
5965
google.golang.org/protobuf v1.36.7 // indirect
66+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6067
gopkg.in/inf.v0 v0.9.1 // indirect
61-
gopkg.in/yaml.v3 v3.0.1 // indirect
62-
k8s.io/apiextensions-apiserver v0.33.2 // indirect
63-
k8s.io/client-go v0.31.14 // indirect
64-
k8s.io/klog/v2 v2.130.1 // indirect
68+
k8s.io/apiextensions-apiserver v0.33.13 // indirect
69+
k8s.io/client-go v0.33.13 // indirect
70+
k8s.io/klog/v2 v2.140.0 // indirect
6571
k8s.io/kube-openapi v0.0.0-20250902184714-7fc278399c7f // indirect
66-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
72+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
6773
sigs.k8s.io/randfill v1.0.0 // indirect
6874
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
6975
sigs.k8s.io/yaml v1.6.0 // indirect
7076
)
7177

72-
// mschuppert: map to latest commit from release-4.16 tag
78+
// mschuppert: map to latest commit from release-4.20 tag
7379
// must consistent within modules and service operators
74-
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e //allow-merging
80+
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20260710141509-36dec0bfafe4 //allow-merging
7581

76-
// pin these to avoid later versions pulled by rabbitmq
77-
replace k8s.io/apimachinery => k8s.io/apimachinery v0.31.14 //allow-merging
82+
// pin these to avoid later versions pulled
83+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.33.13 //allow-merging
7884

79-
replace k8s.io/api => k8s.io/api v0.31.14 //allow-merging
85+
replace k8s.io/api => k8s.io/api v0.33.13 //allow-merging
8086

81-
replace k8s.io/apiserver => k8s.io/apiserver v0.31.14 //allow-merging
87+
replace k8s.io/apiserver => k8s.io/apiserver v0.33.13 //allow-merging
8288

83-
replace k8s.io/client-go => k8s.io/client-go v0.31.14 //allow-merging
89+
replace k8s.io/client-go => k8s.io/client-go v0.33.13 //allow-merging
8490

85-
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.14 //allow-merging
91+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.13 //allow-merging
8692

87-
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.14 //allow-merging
93+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.13 //allow-merging
8894

89-
replace k8s.io/code-generator => k8s.io/code-generator v0.31.14 //allow-merging
95+
replace k8s.io/code-generator => k8s.io/code-generator v0.33.13 //allow-merging
9096

91-
replace k8s.io/component-base => k8s.io/component-base v0.31.14 //allow-merging
97+
replace k8s.io/component-base => k8s.io/component-base v0.33.13 //allow-merging
9298

9399
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e //allow-merging

0 commit comments

Comments
 (0)