Merge pull request #467 from stuggi/remove-webhook-interface-assertions

Remove deprecated webhook.Defaulter/Validator interface assertions

Author: openshift-merge-bot[bot]

api/go.mod

@@ -17,7 +17,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/go-logr/logr v1.4.3 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect

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/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=

api/v1beta1/ansibletest_webhook.go

@@ -28,24 +28,19 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"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"
 )
 
 // log is for logging in this package.
 var ansibletestlog = logf.Log.WithName("ansibletest-resource")
 
-var _ webhook.Defaulter = &AnsibleTest{}
-
 // Default implements webhook.Defaulter so a webhook will be registered for the type
 func (r *AnsibleTest) Default() {
 	ansibletestlog.Info("default", "name", r.Name)
 
 	// TODO(user): fill in your defaulting logic.
 }
 
-var _ webhook.Validator = &AnsibleTest{}
-
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
 func (r *AnsibleTest) ValidateCreate() (admission.Warnings, error) {
 	ansibletestlog.Info("validate create", "name", r.Name)

api/v1beta1/horizontest_webhook.go

@@ -27,24 +27,19 @@ import (
 
 	"k8s.io/apimachinery/pkg/runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
-	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 // log is for logging in this package.
 var horizontestlog = logf.Log.WithName("horizontest-resource")
 
-var _ webhook.Defaulter = &HorizonTest{}
-
 // Default implements webhook.Defaulter so a webhook will be registered for the type
 func (r *HorizonTest) Default() {
 	horizontestlog.Info("default", "name", r.Name)
 
 	// TODO(user): fill in your defaulting logic.
 }
 
-var _ webhook.Validator = &HorizonTest{}
-
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
 func (r *HorizonTest) ValidateCreate() (admission.Warnings, error) {
 	horizontestlog.Info("validate create", "name", r.Name)

api/v1beta1/tempest_webhook.go

@@ -29,15 +29,12 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"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"
 )
 
 // log is for logging in this package.
 var tempestlog = logf.Log.WithName("tempest-resource")
 
-var _ webhook.Defaulter = &Tempest{}
-
 // Default implements webhook.Defaulter so a webhook will be registered for the type
 func (r *Tempest) Default() {
 	tempestlog.Info("default", "name", r.Name)
@@ -60,8 +57,6 @@ func (r *Tempest) PrivilegedRequired() bool {
 	return len(r.Spec.TempestRun.ExtraImages) > 0
 }
 
-var _ webhook.Validator = &Tempest{}
-
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
 func (r *Tempest) ValidateCreate() (admission.Warnings, error) {
 	tempestlog.Info("validate create", "name", r.Name)

api/v1beta1/tobiko_webhook.go

@@ -29,24 +29,19 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"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"
 )
 
 // log is for logging in this package.
 var tobikolog = logf.Log.WithName("tobiko-resource")
 
-var _ webhook.Defaulter = &Tobiko{}
-
 // Default implements webhook.Defaulter so a webhook will be registered for the type
 func (r *Tobiko) Default() {
 	tobikolog.Info("default", "name", r.Name)
 
 	// TODO(user): fill in your defaulting logic.
 }
 
-var _ webhook.Validator = &Tobiko{}
-
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
 func (r *Tobiko) ValidateCreate() (admission.Warnings, error) {
 	tobikolog.Info("validate create", "name", r.Name)