From a7f38e2264d944f26bda2fbaa7e59f7b7bc51c69 Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Thu, 16 Jul 2026 19:31:58 +0200 Subject: [PATCH] Remove deprecated webhook.Defaulter/Validator interface assertions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These compile-time assertions reference webhook.Defaulter and webhook.Validator interfaces that are removed in controller-runtime v0.21 (OCP 4.20). The assertions are dead code — webhook registration already uses CustomDefaulter/CustomValidator in internal/webhook/. Removing them makes the API module forward-compatible with CR v0.21 so that consumers (like openstack-operator) can bump controller-runtime without needing replace directives for this operator. Signed-off-by: Martin Schuppert --- api/go.mod | 1 - api/go.sum | 2 -- api/v1beta1/openstackbaremetalset_webhook.go | 3 --- api/v1beta1/openstackprovisionserver_webhook.go | 5 ----- 4 files changed, 11 deletions(-) diff --git a/api/go.mod b/api/go.mod index ac63f134..05e63a77 100644 --- a/api/go.mod +++ b/api/go.mod @@ -21,7 +21,6 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/emicklei/go-restful/v3 v3.12.1 // indirect github.com/evanphx/json-patch/v5 v5.9.0 // indirect - github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect github.com/gabriel-vasile/mimetype v1.4.12 // indirect github.com/go-openapi/jsonpointer v0.21.0 // indirect diff --git a/api/go.sum b/api/go.sum index 032a90ec..9b432192 100644 --- a/api/go.sum +++ b/api/go.sum @@ -14,8 +14,6 @@ github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lSh github.com/evanphx/json-patch v5.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg= github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= -github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= -github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= github.com/gabriel-vasile/mimetype v1.4.12 h1:e9hWvmLYvtp846tLHam2o++qitpguFiYCKbn0w9jyqw= diff --git a/api/v1beta1/openstackbaremetalset_webhook.go b/api/v1beta1/openstackbaremetalset_webhook.go index a4236891..c03bfb60 100644 --- a/api/v1beta1/openstackbaremetalset_webhook.go +++ b/api/v1beta1/openstackbaremetalset_webhook.go @@ -35,7 +35,6 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" goClient "sigs.k8s.io/controller-runtime/pkg/client" logf "sigs.k8s.io/controller-runtime/pkg/log" - "sigs.k8s.io/controller-runtime/pkg/webhook" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" ) @@ -52,8 +51,6 @@ func SetupWebhookClient(client goClient.Client) { // log is for logging in this package. var openstackbaremetalsetlog = logf.Log.WithName("openstackbaremetalset-resource") -var _ webhook.Validator = &OpenStackBaremetalSet{} - // ValidateCreate implements webhook.Validator so a webhook will be registered for the type func (r *OpenStackBaremetalSet) ValidateCreate() (admission.Warnings, error) { openstackbaremetalsetlog.Info("validate create", "name", r.Name) diff --git a/api/v1beta1/openstackprovisionserver_webhook.go b/api/v1beta1/openstackprovisionserver_webhook.go index 5f46a3f2..f065c940 100644 --- a/api/v1beta1/openstackprovisionserver_webhook.go +++ b/api/v1beta1/openstackprovisionserver_webhook.go @@ -30,7 +30,6 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/validation/field" logf "sigs.k8s.io/controller-runtime/pkg/log" - "sigs.k8s.io/controller-runtime/pkg/webhook" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" ) @@ -45,8 +44,6 @@ func SetupOpenStackProvisionServerDefaults(defaults OpenStackProvisionServerDefa openstackprovisionserverlog.Info("OpenStackProvisionServer defaults initialized", "defaults", defaults) } -var _ webhook.Validator = &OpenStackProvisionServer{} - // ValidateCreate implements webhook.Validator so a webhook will be registered for the type func (r *OpenStackProvisionServer) ValidateCreate() (admission.Warnings, error) { openstackprovisionserverlog.Info("validate create", "name", r.Name) @@ -98,8 +95,6 @@ func (r *OpenStackProvisionServer) ValidateDelete() (admission.Warnings, error) return nil, nil } -var _ webhook.Defaulter = &OpenStackProvisionServer{} - // Default implements webhook.Defaulter so a webhook will be registered for the type func (r *OpenStackProvisionServer) Default() { openstackprovisionserverlog.Info("default", "name", r.Name)