Skip to content

Commit de5ef6b

Browse files
stuggiclaude
stuggi
and
claude
committed
Bump dependencies for OCP 4.20
NOTE: Dataplane test failures due to controller-runtime v0.21 webhook cert handling changes need separate investigation. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent f75fe43 commit de5ef6b

8 files changed

Lines changed: 308 additions & 224 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ OPERATOR_SDK_VERSION ?= v1.41.1
6060
DEFAULT_IMG ?= quay.io/openstack-k8s-operators/openstack-operator:latest
6161
IMG ?= $(DEFAULT_IMG)
6262
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
63-
ENVTEST_K8S_VERSION = 1.31
63+
ENVTEST_K8S_VERSION = 1.33
6464

6565
SETUP_ENVTEST_VERSION ?= release-0.22
6666

‎api/client/v1beta1/openstackclient_webhook.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"k8s.io/apimachinery/pkg/runtime"
2424
ctrl "sigs.k8s.io/controller-runtime"
2525
logf "sigs.k8s.io/controller-runtime/pkg/log"
26-
"sigs.k8s.io/controller-runtime/pkg/webhook"
2726
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
2827
)
2928

@@ -52,7 +51,6 @@ func (r *OpenStackClient) SetupWebhookWithManager(mgr ctrl.Manager) error {
5251

5352
// +kubebuilder:webhook:path=/mutate-client-openstack-org-v1beta1-openstackclient,mutating=true,failurePolicy=fail,sideEffects=None,groups=client.openstack.org,resources=openstackclients,verbs=create;update,versions=v1beta1,name=mopenstackclient.kb.io,admissionReviewVersions=v1
5453

55-
var _ webhook.Defaulter = &OpenStackClient{}
5654

5755
// Default implements webhook.Defaulter so a webhook will be registered for the type
5856
func (r *OpenStackClient) Default() {
@@ -71,7 +69,6 @@ func (spec *OpenStackClientSpec) Default() {
7169
// TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
7270
// +kubebuilder:webhook:path=/validate-client-openstack-org-v1beta1-openstackclient,mutating=false,failurePolicy=fail,sideEffects=None,groups=client.openstack.org,resources=openstackclients,verbs=create;update,versions=v1beta1,name=vopenstackclient.kb.io,admissionReviewVersions=v1
7371

74-
var _ webhook.Validator = &OpenStackClient{}
7572

7673
// ValidateCreate implements webhook.Validator so a webhook will be registered for the type
7774
func (r *OpenStackClient) ValidateCreate() (admission.Warnings, error) {

‎api/dataplane/v1beta1/openstackdataplanedeployment_webhook.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"k8s.io/apimachinery/pkg/util/validation/field"
2424
ctrl "sigs.k8s.io/controller-runtime"
2525
logf "sigs.k8s.io/controller-runtime/pkg/log"
26-
"sigs.k8s.io/controller-runtime/pkg/webhook"
2726
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
2827
)
2928

@@ -38,7 +37,6 @@ func (r *OpenStackDataPlaneDeployment) SetupWebhookWithManager(mgr ctrl.Manager)
3837

3938
// +kubebuilder:webhook:path=/mutate-dataplane-openstack-org-v1beta1-openstackdataplanedeployment,mutating=true,failurePolicy=fail,sideEffects=None,groups=dataplane.openstack.org,resources=openstackdataplanedeployments,verbs=create;update,versions=v1beta1,name=mopenstackdataplanedeployment.kb.io,admissionReviewVersions=v1
4039

41-
var _ webhook.Defaulter = &OpenStackDataPlaneDeployment{}
4240

4341
// Default implements webhook.Defaulter so a webhook will be registered for the type
4442
func (r *OpenStackDataPlaneDeployment) Default() {
@@ -55,7 +53,6 @@ func (spec *OpenStackDataPlaneDeploymentSpec) Default() {
5553
// TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
5654
// +kubebuilder:webhook:path=/validate-dataplane-openstack-org-v1beta1-openstackdataplanedeployment,mutating=false,failurePolicy=fail,sideEffects=None,groups=dataplane.openstack.org,resources=openstackdataplanedeployments,verbs=create;update,versions=v1beta1,name=vopenstackdataplanedeployment.kb.io,admissionReviewVersions=v1
5755

58-
var _ webhook.Validator = &OpenStackDataPlaneDeployment{}
5956

6057
// ValidateCreate implements webhook.Validator so a webhook will be registered for the type
6158
func (r *OpenStackDataPlaneDeployment) ValidateCreate() (admission.Warnings, error) {

‎api/dataplane/v1beta1/openstackdataplaneservice_webhook.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"k8s.io/apimachinery/pkg/util/validation/field"
2424
ctrl "sigs.k8s.io/controller-runtime"
2525
logf "sigs.k8s.io/controller-runtime/pkg/log"
26-
"sigs.k8s.io/controller-runtime/pkg/webhook"
2726
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
2827
)
2928

@@ -38,7 +37,6 @@ func (r *OpenStackDataPlaneService) SetupWebhookWithManager(mgr ctrl.Manager) er
3837

3938
// +kubebuilder:webhook:path=/mutate-dataplane-openstack-org-v1beta1-openstackdataplaneservice,mutating=true,failurePolicy=fail,sideEffects=None,groups=dataplane.openstack.org,resources=openstackdataplaneservices,verbs=create;update,versions=v1beta1,name=mopenstackdataplaneservice.kb.io,admissionReviewVersions=v1
4039

41-
var _ webhook.Defaulter = &OpenStackDataPlaneService{}
4240

4341
// Default implements webhook.Defaulter so a webhook will be registered for the type
4442
func (r *OpenStackDataPlaneService) Default() {
@@ -58,7 +56,6 @@ func (spec *OpenStackDataPlaneServiceSpec) Default(name string) {
5856
// TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
5957
// +kubebuilder:webhook:path=/validate-dataplane-openstack-org-v1beta1-openstackdataplaneservice,mutating=false,failurePolicy=fail,sideEffects=None,groups=dataplane.openstack.org,resources=openstackdataplaneservices,verbs=create;update,versions=v1beta1,name=vopenstackdataplaneservice.kb.io,admissionReviewVersions=v1
6058

61-
var _ webhook.Validator = &OpenStackDataPlaneService{}
6259

6360
// ValidateCreate implements webhook.Validator so a webhook will be registered for the type
6461
func (r *OpenStackDataPlaneService) ValidateCreate() (admission.Warnings, error) {

‎api/go.mod‎

Lines changed: 64 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,17 @@ require (
3535
go.uber.org/zap v1.27.1 // indirect
3636
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
3737
golang.org/x/tools v0.41.0 // indirect
38-
k8s.io/api v0.31.14
39-
k8s.io/apimachinery v0.31.14
40-
k8s.io/client-go v0.31.14
38+
k8s.io/api v0.33.11
39+
k8s.io/apimachinery v0.33.11
40+
k8s.io/client-go v0.33.11
4141
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
42-
sigs.k8s.io/controller-runtime v0.19.7
42+
sigs.k8s.io/controller-runtime v0.21.0
4343
)
4444

4545
require (
4646
github.com/Masterminds/semver/v3 v3.4.0 // indirect
4747
github.com/beorn7/perks v1.0.1 // indirect
48+
github.com/blang/semver/v4 v4.0.0 // indirect
4849
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4950
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5051
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
@@ -61,15 +62,12 @@ require (
6162
github.com/go-playground/universal-translator v0.18.1 // indirect
6263
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
6364
github.com/gogo/protobuf v1.3.2 // indirect
64-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
65-
github.com/golang/protobuf v1.5.4 // indirect
65+
github.com/google/btree v1.1.3 // indirect
6666
github.com/google/gnostic-models v0.7.0 // indirect
6767
github.com/google/go-cmp v0.7.0 // indirect
68-
github.com/google/gofuzz v1.2.0 // indirect
6968
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
7069
github.com/google/uuid v1.6.0 // indirect
7170
github.com/gophercloud/gophercloud/v2 v2.8.0 // indirect
72-
github.com/imdario/mergo v0.3.16 // indirect
7371
github.com/josharian/intern v1.0.0 // indirect
7472
github.com/json-iterator/go v1.1.12 // indirect
7573
github.com/leodido/go-urn v1.4.0 // indirect
@@ -102,9 +100,10 @@ require (
102100
golang.org/x/time v0.12.0 // indirect
103101
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
104102
google.golang.org/protobuf v1.36.7 // indirect
103+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
105104
gopkg.in/inf.v0 v0.9.1 // indirect
106105
gopkg.in/yaml.v3 v3.0.1 // indirect
107-
k8s.io/apiextensions-apiserver v0.33.2 // indirect
106+
k8s.io/apiextensions-apiserver v0.33.11 // indirect
108107
k8s.io/klog/v2 v2.130.1 // indirect
109108
k8s.io/kube-openapi v0.0.0-20250902184714-7fc278399c7f // indirect
110109
sigs.k8s.io/gateway-api v1.2.1 // indirect
@@ -115,30 +114,76 @@ require (
115114
sigs.k8s.io/yaml v1.6.0 // indirect
116115
)
117116

118-
// mschuppert: map to latest commit from release-4.18 tag
117+
// mschuppert: map to latest commit from release-4.20 tag
119118
// must consistent within modules and service operators
120-
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e //allow-merging
119+
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20260107143020-50517c6f4bfd //allow-merging
121120

122121
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.16.0_patches)
123122
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec //allow-merging
124123

125124
// pin to support rabbitmq 2.16.0 rebase
126125
//replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e //allow-merging
127126

128-
replace k8s.io/apimachinery => k8s.io/apimachinery v0.31.14 //allow-merging
127+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.33.11 //allow-merging
129128

130-
replace k8s.io/api => k8s.io/api v0.31.14 //allow-merging
129+
replace k8s.io/api => k8s.io/api v0.33.11 //allow-merging
131130

132-
replace k8s.io/apiserver => k8s.io/apiserver v0.31.14 //allow-merging
131+
replace k8s.io/apiserver => k8s.io/apiserver v0.33.11 //allow-merging
133132

134-
replace k8s.io/client-go => k8s.io/client-go v0.31.14 //allow-merging
133+
replace k8s.io/client-go => k8s.io/client-go v0.33.11 //allow-merging
135134

136-
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.14 //allow-merging
135+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.11 //allow-merging
137136

138-
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.14 //allow-merging
137+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.11 //allow-merging
139138

140-
replace k8s.io/code-generator => k8s.io/code-generator v0.31.14 //allow-merging
139+
replace k8s.io/code-generator => k8s.io/code-generator v0.33.11 //allow-merging
141140

142-
replace k8s.io/component-base => k8s.io/component-base v0.31.14 //allow-merging
141+
replace k8s.io/component-base => k8s.io/component-base v0.33.11 //allow-merging
143142

144143
replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.1.2-0.20241127223932-88edb96860cf //allow-merging
144+
145+
replace sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.21.0 //allow-merging
146+
147+
replace github.com/openstack-k8s-operators/lib-common/modules/common => github.com/stuggi/lib-common/modules/common v0.0.0-20260429152920-f1900d36ca2b
148+
149+
replace github.com/openstack-k8s-operators/lib-common/modules/storage => github.com/stuggi/lib-common/modules/storage v0.0.0-20260429152920-f1900d36ca2b
150+
151+
replace github.com/openstack-k8s-operators/infra-operator/apis => github.com/stuggi/infra-operator/apis v0.0.0-20260429134914-41a7e59a5a38
152+
153+
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/stuggi/keystone-operator/api v0.0.0-20260429160458-495e7b1a1ff9
154+
155+
replace github.com/openstack-k8s-operators/mariadb-operator/api => github.com/stuggi/mariadb-operator/api v0.0.0-20260429155043-94ed6e2dbe07
156+
157+
replace github.com/openstack-k8s-operators/ovn-operator/api => github.com/stuggi/ovn-operator/api v0.0.0-20260430083155-c9b920f3fc72
158+
159+
replace github.com/openstack-k8s-operators/nova-operator/api => github.com/stuggi/nova-operator/api v0.0.0-20260430083758-cb7665181e05
160+
161+
replace github.com/openstack-k8s-operators/neutron-operator/api => github.com/stuggi/neutron-operator/api v0.0.0-20260430084226-a9a77e682c1d
162+
163+
replace github.com/openstack-k8s-operators/cinder-operator/api => github.com/stuggi/cinder-operator/api v0.0.0-20260430091358-88f48a987f79
164+
165+
replace github.com/openstack-k8s-operators/barbican-operator/api => github.com/stuggi/barbican-operator/api v0.0.0-20260430093502-60eb6a246db7
166+
167+
replace github.com/openstack-k8s-operators/designate-operator/api => github.com/stuggi/designate-operator/api v0.0.0-20260430094528-d0ef7bff221a
168+
169+
replace github.com/openstack-k8s-operators/horizon-operator/api => github.com/stuggi/horizon-operator/api v0.0.0-20260430085027-fa2617d65a3e
170+
171+
replace github.com/openstack-k8s-operators/glance-operator/api => github.com/stuggi/glance-operator/api v0.0.0-20260430092218-5ae76824f036
172+
173+
replace github.com/openstack-k8s-operators/manila-operator/api => github.com/stuggi/manila-operator/api v0.0.0-20260430092422-b8a5f0842e04
174+
175+
replace github.com/openstack-k8s-operators/heat-operator/api => github.com/stuggi/heat-operator/api v0.0.0-20260430092547-055fd43af50d
176+
177+
replace github.com/openstack-k8s-operators/ironic-operator/api => github.com/stuggi/ironic-operator/api v0.0.0-20260430092827-b145e0d36b73
178+
179+
replace github.com/openstack-k8s-operators/octavia-operator/api => github.com/stuggi/octavia-operator/api v0.0.0-20260430093113-388344b2a9ff
180+
181+
replace github.com/openstack-k8s-operators/swift-operator/api => github.com/stuggi/swift-operator/api v0.0.0-20260430093623-53d42492c000
182+
183+
replace github.com/openstack-k8s-operators/placement-operator/api => github.com/stuggi/placement-operator/api v0.0.0-20260430093851-dcb05e21ece1
184+
185+
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/stuggi/telemetry-operator/api v0.0.0-20260430094116-9bfa3b70ff67
186+
187+
replace github.com/openstack-k8s-operators/watcher-operator/api => github.com/stuggi/watcher-operator/api v0.0.0-20260430094004-e8bc2ecd27bf
188+
189+
replace github.com/openstack-k8s-operators/openstack-baremetal-operator/api => github.com/stuggi/openstack-baremetal-operator/api v0.0.0-20260430094241-b11afe31140a

0 commit comments

Comments
 (0)