Skip to content

Commit 13cd9c6

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 - cert-manager: v1.16.5 -> v1.18.6 - cmctl: v2.1.2 -> v2.3.0 - ENVTEST_K8S_VERSION: 1.31 -> 1.33 - OC_VERSION: 4.16.0 -> 4.20.0 - CRD_SCHEMA_CHECKER_VERSION: release-4.16 -> release-4.18 Code changes required by the bump: - Remove webhook.Defaulter/webhook.Validator interface assertions from api/client and api/dataplane webhook files (removed in controller-runtime v0.21) - Remove old-style SetupWebhookWithManager methods (superseded by internal/webhook CustomDefaulter/CustomValidator pattern) - Remove duplicate kubebuilder webhook annotations from api/ files (already present in internal/webhook/ files) - Update test suites to use new webhook setup functions - Update test expectations for ServicesOverride from nil to []string{} (k8s 1.33 serialization normalizes omitted slice fields to empty slices instead of nil) Jira: OSPRH-32989 Depends-On: openstack-k8s-operators/lib-common#717 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
1 parent 7acee07 commit 13cd9c6

15 files changed

Lines changed: 447 additions & 684 deletions

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ OPERATOR_SDK_VERSION ?= v1.42.3
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

@@ -332,7 +332,7 @@ CONTROLLER_TOOLS_VERSION ?= v0.18.0
332332
CRD_MARKDOWN_VERSION ?= v0.0.3
333333
KUTTL_VERSION ?= 0.17.0
334334
GOTOOLCHAIN_VERSION ?= go1.26.0
335-
OC_VERSION ?= 4.16.0
335+
OC_VERSION ?= 4.20.0
336336

337337
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
338338
.PHONY: kustomize
@@ -568,7 +568,7 @@ run-with-webhook: manifests generate fmt vet ## Run a controller from your host.
568568
webhook-cleanup:
569569
/bin/bash hack/clean_local_webhook.sh
570570

571-
CRD_SCHEMA_CHECKER_VERSION ?= release-4.16
571+
CRD_SCHEMA_CHECKER_VERSION ?= release-4.18
572572

573573
PHONY: crd-schema-check
574574
crd-schema-check: manifests

‎api/client/v1beta1/openstackclient_webhook.go‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ package v1beta1
2121

2222
import (
2323
"k8s.io/apimachinery/pkg/runtime"
24-
ctrl "sigs.k8s.io/controller-runtime"
2524
logf "sigs.k8s.io/controller-runtime/pkg/log"
26-
"sigs.k8s.io/controller-runtime/pkg/webhook"
2725
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
2826
)
2927

@@ -43,18 +41,7 @@ func SetupOpenStackClientDefaults(defaults OpenStackClientDefaults) {
4341
openstackclientlog.Info("OpenStackClient defaults initialized", "defaults", defaults)
4442
}
4543

46-
// SetupWebhookWithManager sets up the webhook with the Manager
47-
func (r *OpenStackClient) SetupWebhookWithManager(mgr ctrl.Manager) error {
48-
return ctrl.NewWebhookManagedBy(mgr).
49-
For(r).
50-
Complete()
51-
}
52-
53-
// +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
54-
55-
var _ webhook.Defaulter = &OpenStackClient{}
56-
57-
// Default implements webhook.Defaulter so a webhook will be registered for the type
44+
// Default sets default values for the OpenStackClient
5845
func (r *OpenStackClient) Default() {
5946
openstackclientlog.Info("default", "name", r.Name)
6047

@@ -68,12 +55,7 @@ func (spec *OpenStackClientSpec) Default() {
6855
}
6956
}
7057

71-
// TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
72-
// +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
73-
74-
var _ webhook.Validator = &OpenStackClient{}
75-
76-
// ValidateCreate implements webhook.Validator so a webhook will be registered for the type
58+
// ValidateCreate validates the OpenStackClient on creation
7759
func (r *OpenStackClient) ValidateCreate() (admission.Warnings, error) {
7860
openstackclientlog.Info("validate create", "name", r.Name)
7961

‎api/client/v1beta1/webhook_suite_test.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ var _ = BeforeSuite(func() {
111111
})
112112
Expect(err).NotTo(HaveOccurred())
113113

114-
err = (&OpenStackClient{}).SetupWebhookWithManager(mgr)
114+
err = ctrl.NewWebhookManagedBy(mgr).
115+
For(&OpenStackClient{}).
116+
Complete()
115117
Expect(err).NotTo(HaveOccurred())
116118

117119
// +kubebuilder:scaffold:webhook

‎api/dataplane/v1beta1/openstackdataplanedeployment_webhook.go‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,13 @@ import (
2424
"k8s.io/apimachinery/pkg/runtime"
2525
"k8s.io/apimachinery/pkg/runtime/schema"
2626
"k8s.io/apimachinery/pkg/util/validation/field"
27-
ctrl "sigs.k8s.io/controller-runtime"
2827
logf "sigs.k8s.io/controller-runtime/pkg/log"
29-
"sigs.k8s.io/controller-runtime/pkg/webhook"
3028
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
3129
)
3230

3331
var openstackdataplanedeploymentlog = logf.Log.WithName("openstackdataplanedeployment-resource")
3432

35-
// SetupWebhookWithManager sets up the webhook with the Manager
36-
func (r *OpenStackDataPlaneDeployment) SetupWebhookWithManager(mgr ctrl.Manager) error {
37-
return ctrl.NewWebhookManagedBy(mgr).For(r).Complete()
38-
}
39-
40-
// TODO(user): EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
41-
42-
// +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
43-
44-
var _ webhook.Defaulter = &OpenStackDataPlaneDeployment{}
45-
46-
// Default implements webhook.Defaulter so a webhook will be registered for the type
33+
// Default sets default values for the OpenStackDataPlaneDeployment
4734
func (r *OpenStackDataPlaneDeployment) Default() {
4835

4936
openstackdataplanedeploymentlog.Info("default", "name", r.Name)
@@ -57,12 +44,7 @@ func (spec *OpenStackDataPlaneDeploymentSpec) Default() {
5744
}
5845
}
5946

60-
// TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
61-
// +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
62-
63-
var _ webhook.Validator = &OpenStackDataPlaneDeployment{}
64-
65-
// ValidateCreate implements webhook.Validator so a webhook will be registered for the type
47+
// ValidateCreate validates the OpenStackDataPlaneDeployment on creation
6648
func (r *OpenStackDataPlaneDeployment) ValidateCreate() (admission.Warnings, error) {
6749

6850
openstackdataplanedeploymentlog.Info("validate create", "name", r.Name)

‎api/dataplane/v1beta1/openstackdataplaneservice_webhook.go‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,13 @@ import (
2121
"k8s.io/apimachinery/pkg/runtime"
2222
"k8s.io/apimachinery/pkg/runtime/schema"
2323
"k8s.io/apimachinery/pkg/util/validation/field"
24-
ctrl "sigs.k8s.io/controller-runtime"
2524
logf "sigs.k8s.io/controller-runtime/pkg/log"
26-
"sigs.k8s.io/controller-runtime/pkg/webhook"
2725
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
2826
)
2927

3028
var openstackdataplaneservicelog = logf.Log.WithName("openstackdataplaneservice-resource")
3129

32-
// SetupWebhookWithManager sets up the webhook with the Manager
33-
func (r *OpenStackDataPlaneService) SetupWebhookWithManager(mgr ctrl.Manager) error {
34-
return ctrl.NewWebhookManagedBy(mgr).For(r).Complete()
35-
}
36-
37-
// TODO(user): EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
38-
39-
// +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
40-
41-
var _ webhook.Defaulter = &OpenStackDataPlaneService{}
42-
43-
// Default implements webhook.Defaulter so a webhook will be registered for the type
30+
// Default sets default values for the OpenStackDataPlaneService
4431
func (r *OpenStackDataPlaneService) Default() {
4532

4633
openstackdataplaneservicelog.Info("default", "name", r.Name)
@@ -55,12 +42,7 @@ func (spec *OpenStackDataPlaneServiceSpec) Default(name string) {
5542
}
5643
}
5744

58-
// TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
59-
// +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
60-
61-
var _ webhook.Validator = &OpenStackDataPlaneService{}
62-
63-
// ValidateCreate implements webhook.Validator so a webhook will be registered for the type
45+
// ValidateCreate validates the OpenStackDataPlaneService on creation
6446
func (r *OpenStackDataPlaneService) ValidateCreate() (admission.Warnings, error) {
6547

6648
openstackdataplaneservicelog.Info("validate create", "name", r.Name)

‎api/go.mod‎

Lines changed: 62 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,51 @@ module github.com/openstack-k8s-operators/openstack-operator/api
33
go 1.26.3
44

55
require (
6-
github.com/cert-manager/cert-manager v1.16.5
6+
github.com/cert-manager/cert-manager v1.18.6
77
github.com/go-playground/validator/v10 v10.30.3
88
github.com/onsi/ginkgo/v2 v2.32.0
99
github.com/onsi/gomega v1.42.1
10-
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260714135602-652c4f0d798c
11-
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260714133749-3b558c37a8cb
12-
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260714135601-492b297bdef5
13-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260714133449-d92354da43be
14-
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260714135254-83b52107ffd1
15-
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260714135255-da1877333ea9
16-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260714134945-80e29d8f69ef
17-
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260714134945-b044864ce7e2
18-
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260714135602-d655dab1e1fb
19-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260713090837-13a3b65580c3
20-
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260713090837-13a3b65580c3
21-
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260714133750-c3e5ab0c2a88
22-
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260714133749-534e2d337130
10+
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260717082955-b25af6ff1087
11+
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260716205053-7ad98e609154
12+
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260717082956-6b2bdd9bfdd2
13+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260717094039-f1d7fb345f28
14+
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260717082954-395ba05a1d72
15+
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260717055020-d6fe9695a18d
16+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260717091754-2c13031ef562
17+
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260717082955-1315ee255e84
18+
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260717082957-bb1267fa59f8
19+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260717092345-ab1ee7b97c67
20+
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260717092345-ab1ee7b97c67
21+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260716214616-30dd31bbefc3
22+
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260717073207-ba482b381e95
2323
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260714134644-9fc331394c73
24-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260714134342-8920bcd01fcf
25-
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260714134042-25b0da9d7d68
26-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260714134042-c5bd1cdebd17
27-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260714133750-064955c32d14
28-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260714140151-b73d90d1241b
29-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260714150312-32637aaee8eb
30-
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260714153015-d5b65e14bbe0
24+
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260717072019-94f14ea3c317
25+
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260717082955-8f0b1feba445
26+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260717083531-843739e7cf37
27+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260717082956-a1203c40e98a
28+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260716201833-77d5da4db5ec
29+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260717104028-6a7c51fcdba8
30+
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260717105117-caf5ae967806
3131
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.77.1-rhobs1 // indirect
3232
github.com/rhobs/observability-operator v1.0.0 // indirect
3333
go.uber.org/multierr v1.11.0 // indirect
3434
go.uber.org/zap v1.28.0 // indirect
3535
golang.org/x/exp v0.0.0-20260611194520-c48552f49976
3636
golang.org/x/tools v0.48.0 // indirect
37-
k8s.io/api v0.31.14
38-
k8s.io/apimachinery v0.31.14
39-
k8s.io/client-go v0.31.14
40-
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
41-
sigs.k8s.io/controller-runtime v0.19.7
37+
k8s.io/api v0.33.13
38+
k8s.io/apimachinery v0.33.13
39+
k8s.io/client-go v0.33.13
40+
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
41+
sigs.k8s.io/controller-runtime v0.21.0
4242
)
4343

4444
require (
4545
github.com/Masterminds/semver/v3 v3.4.0 // indirect
4646
github.com/beorn7/perks v1.0.1 // indirect
47+
github.com/blang/semver/v4 v4.0.0 // indirect
4748
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4849
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
49-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
50+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
5051
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
5152
github.com/fsnotify/fsnotify v1.9.0 // indirect
5253
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
@@ -55,40 +56,45 @@ require (
5556
github.com/go-logr/zapr v1.3.0 // indirect
5657
github.com/go-openapi/jsonpointer v0.21.1 // indirect
5758
github.com/go-openapi/jsonreference v0.21.0 // indirect
58-
github.com/go-openapi/swag v0.23.1 // indirect
59+
github.com/go-openapi/swag v0.25.4 // indirect
60+
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
61+
github.com/go-openapi/swag/conv v0.25.4 // indirect
62+
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
63+
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
64+
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
65+
github.com/go-openapi/swag/loading v0.25.4 // indirect
66+
github.com/go-openapi/swag/mangling v0.25.4 // indirect
67+
github.com/go-openapi/swag/netutils v0.25.4 // indirect
68+
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
69+
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
70+
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
5971
github.com/go-playground/locales v0.14.1 // indirect
6072
github.com/go-playground/universal-translator v0.18.1 // indirect
6173
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
6274
github.com/gogo/protobuf v1.3.2 // indirect
63-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
64-
github.com/golang/protobuf v1.5.4 // indirect
75+
github.com/google/btree v1.1.3 // indirect
6576
github.com/google/gnostic-models v0.7.0 // indirect
6677
github.com/google/go-cmp v0.7.0 // indirect
67-
github.com/google/gofuzz v1.2.0 // indirect
6878
github.com/google/pprof v0.0.0-20260402051712-545e8a4df936 // indirect
6979
github.com/google/uuid v1.6.0 // indirect
7080
github.com/gophercloud/gophercloud/v2 v2.13.0 // indirect
71-
github.com/imdario/mergo v0.3.16 // indirect
72-
github.com/josharian/intern v1.0.0 // indirect
7381
github.com/json-iterator/go v1.1.12 // indirect
7482
github.com/leodido/go-urn v1.4.0 // indirect
75-
github.com/mailru/easyjson v0.9.0 // indirect
76-
github.com/metal3-io/baremetal-operator/apis v0.9.3 // indirect
77-
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1 // indirect
83+
github.com/metal3-io/baremetal-operator/apis v0.11.7 // indirect
7884
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7985
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
8086
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8187
github.com/openshift/api v3.9.0+incompatible // indirect
82-
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260713090837-13a3b65580c3 // indirect
88+
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260717092345-ab1ee7b97c67 // indirect
8389
github.com/pkg/errors v0.9.1 // indirect
8490
github.com/prometheus/client_golang v1.22.0 // indirect
8591
github.com/prometheus/client_model v0.6.2 // indirect
8692
github.com/prometheus/common v0.65.0 // indirect
8793
github.com/prometheus/procfs v0.16.1 // indirect
8894
github.com/robfig/cron/v3 v3.0.1 // indirect
89-
github.com/spf13/pflag v1.0.9 // indirect
95+
github.com/spf13/pflag v1.0.10 // indirect
9096
github.com/x448/float16 v0.8.4 // indirect
91-
go.yaml.in/yaml/v2 v2.4.2 // indirect
97+
go.yaml.in/yaml/v2 v2.4.3 // indirect
9298
go.yaml.in/yaml/v3 v3.0.4 // indirect
9399
golang.org/x/crypto v0.54.0 // indirect
94100
golang.org/x/mod v0.38.0 // indirect
@@ -101,37 +107,38 @@ require (
101107
golang.org/x/time v0.15.0 // indirect
102108
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
103109
google.golang.org/protobuf v1.36.7 // indirect
110+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
104111
gopkg.in/inf.v0 v0.9.1 // indirect
105-
gopkg.in/yaml.v3 v3.0.1 // indirect
106-
k8s.io/apiextensions-apiserver v0.33.2 // indirect
107-
k8s.io/klog/v2 v2.130.1 // indirect
112+
k8s.io/apiextensions-apiserver v0.33.13 // indirect
113+
k8s.io/klog/v2 v2.140.0 // indirect
108114
k8s.io/kube-openapi v0.0.0-20250902184714-7fc278399c7f // indirect
109115
sigs.k8s.io/gateway-api v1.2.1 // indirect
110-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
116+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
111117
sigs.k8s.io/randfill v1.0.0 // indirect
112118
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
113-
sigs.k8s.io/structured-merge-diff/v6 v6.2.0 // indirect
114119
sigs.k8s.io/yaml v1.6.0 // indirect
115120
)
116121

117-
// mschuppert: map to latest commit from release-4.18 tag
122+
// mschuppert: map to latest commit from release-4.20 tag
118123
// must consistent within modules and service operators
119-
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e //allow-merging
124+
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20260710141509-36dec0bfafe4 //allow-merging
120125

121-
replace k8s.io/apimachinery => k8s.io/apimachinery v0.31.14 //allow-merging
126+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.33.13 //allow-merging
122127

123-
replace k8s.io/api => k8s.io/api v0.31.14 //allow-merging
128+
replace k8s.io/api => k8s.io/api v0.33.13 //allow-merging
124129

125-
replace k8s.io/apiserver => k8s.io/apiserver v0.31.14 //allow-merging
130+
replace k8s.io/apiserver => k8s.io/apiserver v0.33.13 //allow-merging
126131

127-
replace k8s.io/client-go => k8s.io/client-go v0.31.14 //allow-merging
132+
replace k8s.io/client-go => k8s.io/client-go v0.33.13 //allow-merging
128133

129-
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.14 //allow-merging
134+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.13 //allow-merging
130135

131-
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.14 //allow-merging
136+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.13 //allow-merging
132137

133-
replace k8s.io/code-generator => k8s.io/code-generator v0.31.14 //allow-merging
138+
replace k8s.io/code-generator => k8s.io/code-generator v0.33.13 //allow-merging
134139

135-
replace k8s.io/component-base => k8s.io/component-base v0.31.14 //allow-merging
140+
replace k8s.io/component-base => k8s.io/component-base v0.33.13 //allow-merging
136141

137-
replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.1.2-0.20241127223932-88edb96860cf //allow-merging
142+
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e //allow-merging
143+
144+
replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.3.0 //allow-merging

0 commit comments

Comments
 (0)