Skip to content

Commit 469f3a7

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3462 from dmvolod/fix-webhook-alias
🌱 Fix web-hook structure names and descriptions
2 parents b466b12 + a9803d0 commit 469f3a7

20 files changed

+125
-125
lines changed

‎controllers/vmware/test/controllers_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,10 +262,10 @@ func getManager(cfg *rest.Config, networkProvider string, withWebhooks bool) man
262262
}
263263

264264
if withWebhooks {
265-
if err := (&vmwarewebhooks.VSphereMachineTemplateWebhook{}).SetupWebhookWithManager(mgr); err != nil {
265+
if err := (&vmwarewebhooks.VSphereMachineTemplate{}).SetupWebhookWithManager(mgr); err != nil {
266266
return err
267267
}
268-
if err := (&vmwarewebhooks.VSphereMachineWebhook{}).SetupWebhookWithManager(mgr); err != nil {
268+
if err := (&vmwarewebhooks.VSphereMachine{}).SetupWebhookWithManager(mgr); err != nil {
269269
return err
270270
}
271271
}

‎internal/test/helpers/envtest.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,27 +195,27 @@ func NewTestEnvironment(ctx context.Context) *TestEnvironment {
195195
Password: simr.Password(),
196196
}
197197
managerOpts.AddToManager = func(_ context.Context, _ *capvcontext.ControllerManagerContext, mgr ctrlmgr.Manager) error {
198-
if err := (&webhooks.VSphereClusterTemplateWebhook{}).SetupWebhookWithManager(mgr); err != nil {
198+
if err := (&webhooks.VSphereClusterTemplate{}).SetupWebhookWithManager(mgr); err != nil {
199199
return err
200200
}
201201

202-
if err := (&webhooks.VSphereMachineWebhook{}).SetupWebhookWithManager(mgr); err != nil {
202+
if err := (&webhooks.VSphereMachine{}).SetupWebhookWithManager(mgr); err != nil {
203203
return err
204204
}
205205

206-
if err := (&webhooks.VSphereMachineTemplateWebhook{}).SetupWebhookWithManager(mgr); err != nil {
206+
if err := (&webhooks.VSphereMachineTemplate{}).SetupWebhookWithManager(mgr); err != nil {
207207
return err
208208
}
209209

210-
if err := (&webhooks.VSphereVMWebhook{}).SetupWebhookWithManager(mgr); err != nil {
210+
if err := (&webhooks.VSphereVM{}).SetupWebhookWithManager(mgr); err != nil {
211211
return err
212212
}
213213

214-
if err := (&webhooks.VSphereDeploymentZoneWebhook{}).SetupWebhookWithManager(mgr); err != nil {
214+
if err := (&webhooks.VSphereDeploymentZone{}).SetupWebhookWithManager(mgr); err != nil {
215215
return err
216216
}
217217

218-
return (&webhooks.VSphereFailureDomainWebhook{}).SetupWebhookWithManager(mgr)
218+
return (&webhooks.VSphereFailureDomain{}).SetupWebhookWithManager(mgr)
219219
}
220220

221221
mgr, err := manager.New(ctx, managerOpts)

‎internal/webhooks/vmware/vspheremachine.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ import (
3535
// +kubebuilder:webhook:verbs=create;update,path=/validate-vmware-infrastructure-cluster-x-k8s-io-v1beta1-vspheremachine,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=vmware.infrastructure.cluster.x-k8s.io,resources=vspheremachines,versions=v1beta1,name=validation.vspheremachine.vmware.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1
3636
// +kubebuilder:webhook:verbs=create;update,path=/mutate-vmware-infrastructure-cluster-x-k8s-io-v1beta1-vspheremachine,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=vmware.infrastructure.cluster.x-k8s.io,resources=vspheremachines,versions=v1beta1,name=default.vspheremachine.vmware.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1
3737

38-
// VSphereMachineWebhook implements a validation and defaulting webhook for VSphereMachine.
39-
type VSphereMachineWebhook struct{}
38+
// VSphereMachine implements a validation and defaulting webhook for VSphereMachine.
39+
type VSphereMachine struct{}
4040

41-
var _ webhook.CustomValidator = &VSphereMachineWebhook{}
42-
var _ webhook.CustomDefaulter = &VSphereMachineWebhook{}
41+
var _ webhook.CustomValidator = &VSphereMachine{}
42+
var _ webhook.CustomDefaulter = &VSphereMachine{}
4343

44-
func (webhook *VSphereMachineWebhook) SetupWebhookWithManager(mgr ctrl.Manager) error {
44+
func (webhook *VSphereMachine) SetupWebhookWithManager(mgr ctrl.Manager) error {
4545
return ctrl.NewWebhookManagedBy(mgr).
4646
For(&vmwarev1.VSphereMachine{}).
4747
WithValidator(webhook).
@@ -50,17 +50,17 @@ func (webhook *VSphereMachineWebhook) SetupWebhookWithManager(mgr ctrl.Manager)
5050
}
5151

5252
// Default implements webhook.Defaulter so a webhook will be registered for the type.
53-
func (webhook *VSphereMachineWebhook) Default(_ context.Context, _ runtime.Object) error {
53+
func (webhook *VSphereMachine) Default(_ context.Context, _ runtime.Object) error {
5454
return nil
5555
}
5656

5757
// ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
58-
func (webhook *VSphereMachineWebhook) ValidateCreate(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
58+
func (webhook *VSphereMachine) ValidateCreate(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
5959
return nil, nil
6060
}
6161

6262
// ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
63-
func (webhook *VSphereMachineWebhook) ValidateUpdate(_ context.Context, oldRaw runtime.Object, newRaw runtime.Object) (admission.Warnings, error) {
63+
func (webhook *VSphereMachine) ValidateUpdate(_ context.Context, oldRaw runtime.Object, newRaw runtime.Object) (admission.Warnings, error) {
6464
var allErrs field.ErrorList
6565

6666
newTyped, ok := newRaw.(*vmwarev1.VSphereMachine)
@@ -100,6 +100,6 @@ func (webhook *VSphereMachineWebhook) ValidateUpdate(_ context.Context, oldRaw r
100100
}
101101

102102
// ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
103-
func (webhook *VSphereMachineWebhook) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
103+
func (webhook *VSphereMachine) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
104104
return nil, nil
105105
}

‎internal/webhooks/vmware/vspheremachine_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func TestVSphereMachine_ValidateUpdate(t *testing.T) {
6868
t.Run(tc.name, func(t *testing.T) {
6969
g := NewWithT(t)
7070

71-
webhook := &VSphereMachineWebhook{}
71+
webhook := &VSphereMachine{}
7272
_, err := webhook.ValidateUpdate(context.Background(), tc.oldVSphereMachine, tc.vsphereMachine)
7373
if tc.wantErr {
7474
g.Expect(err).To(HaveOccurred())

‎internal/webhooks/vmware/vspheremachinetemplate.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,20 @@ import (
3535

3636
// +kubebuilder:webhook:verbs=create;update,path=/validate-vmware-infrastructure-cluster-x-k8s-io-v1beta1-vspheremachinetemplate,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=vmware.infrastructure.cluster.x-k8s.io,resources=vspheremachinetemplates,versions=v1beta1,name=validation.vspheremachinetemplate.vmware.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1
3737

38-
// VSphereMachineTemplateWebhook implements a validation webhook for VSphereMachineTemplate.
39-
type VSphereMachineTemplateWebhook struct{}
38+
// VSphereMachineTemplate implements a validation webhook for VSphereMachineTemplate.
39+
type VSphereMachineTemplate struct{}
4040

41-
var _ webhook.CustomValidator = &VSphereMachineTemplateWebhook{}
41+
var _ webhook.CustomValidator = &VSphereMachineTemplate{}
4242

43-
func (webhook *VSphereMachineTemplateWebhook) SetupWebhookWithManager(mgr ctrl.Manager) error {
43+
func (webhook *VSphereMachineTemplate) SetupWebhookWithManager(mgr ctrl.Manager) error {
4444
return ctrl.NewWebhookManagedBy(mgr).
4545
For(&vmwarev1.VSphereMachineTemplate{}).
4646
WithValidator(webhook).
4747
Complete()
4848
}
4949

5050
// ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
51-
func (webhook *VSphereMachineTemplateWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
51+
func (webhook *VSphereMachineTemplate) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
5252
vSphereMachineTemplate, ok := obj.(*vmwarev1.VSphereMachineTemplate)
5353
if !ok {
5454
return nil, apierrors.NewBadRequest(fmt.Sprintf("expected a VSphereMachineTemplate but got a %T", obj))
@@ -57,15 +57,15 @@ func (webhook *VSphereMachineTemplateWebhook) ValidateCreate(ctx context.Context
5757
}
5858

5959
// ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
60-
func (webhook *VSphereMachineTemplateWebhook) ValidateUpdate(ctx context.Context, _, newRaw runtime.Object) (admission.Warnings, error) {
60+
func (webhook *VSphereMachineTemplate) ValidateUpdate(ctx context.Context, _, newRaw runtime.Object) (admission.Warnings, error) {
6161
vSphereMachineTemplate, ok := newRaw.(*vmwarev1.VSphereMachineTemplate)
6262
if !ok {
6363
return nil, apierrors.NewBadRequest(fmt.Sprintf("expected a VSphereMachineTemplate but got a %T", newRaw))
6464
}
6565
return webhook.validate(ctx, nil, vSphereMachineTemplate)
6666
}
6767

68-
func (webhook *VSphereMachineTemplateWebhook) validate(_ context.Context, _, newVSphereMachineTemplate *vmwarev1.VSphereMachineTemplate) (admission.Warnings, error) {
68+
func (webhook *VSphereMachineTemplate) validate(_ context.Context, _, newVSphereMachineTemplate *vmwarev1.VSphereMachineTemplate) (admission.Warnings, error) {
6969
var allErrs field.ErrorList
7070

7171
// Validate namingStrategy
@@ -103,6 +103,6 @@ func (webhook *VSphereMachineTemplateWebhook) validate(_ context.Context, _, new
103103
}
104104

105105
// ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
106-
func (webhook *VSphereMachineTemplateWebhook) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
106+
func (webhook *VSphereMachineTemplate) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
107107
return nil, nil
108108
}

‎internal/webhooks/vmware/vspheremachinetemplate_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func TestVSphereMachineTemplate_Validate(t *testing.T) {
8787
},
8888
}
8989

90-
webhook := &VSphereMachineTemplateWebhook{}
90+
webhook := &VSphereMachineTemplate{}
9191
_, err := webhook.validate(context.Background(), nil, vSphereMachineTemplate)
9292
if tc.wantErr {
9393
g.Expect(err).To(HaveOccurred())

‎internal/webhooks/vsphereclustertemplate.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,25 @@ import (
3333

3434
// +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta1-vsphereclustertemplate,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=vsphereclustertemplates,versions=v1beta1,name=validation.vsphereclustertemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1
3535

36-
// VSphereClusterTemplateWebhook implements a validation and defaulting webhook for VSphereClusterTemplate.
37-
type VSphereClusterTemplateWebhook struct{}
36+
// VSphereClusterTemplate implements a validation webhook for VSphereClusterTemplate.
37+
type VSphereClusterTemplate struct{}
3838

39-
var _ webhook.CustomValidator = &VSphereClusterTemplateWebhook{}
39+
var _ webhook.CustomValidator = &VSphereClusterTemplate{}
4040

41-
func (webhook *VSphereClusterTemplateWebhook) SetupWebhookWithManager(mgr ctrl.Manager) error {
41+
func (webhook *VSphereClusterTemplate) SetupWebhookWithManager(mgr ctrl.Manager) error {
4242
return ctrl.NewWebhookManagedBy(mgr).
4343
For(&infrav1.VSphereClusterTemplate{}).
4444
WithValidator(webhook).
4545
Complete()
4646
}
4747

4848
// ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
49-
func (webhook *VSphereClusterTemplateWebhook) ValidateCreate(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
49+
func (webhook *VSphereClusterTemplate) ValidateCreate(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
5050
return nil, nil
5151
}
5252

5353
// ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
54-
func (webhook *VSphereClusterTemplateWebhook) ValidateUpdate(_ context.Context, oldRaw runtime.Object, newRaw runtime.Object) (admission.Warnings, error) {
54+
func (webhook *VSphereClusterTemplate) ValidateUpdate(_ context.Context, oldRaw runtime.Object, newRaw runtime.Object) (admission.Warnings, error) {
5555
oldTyped, ok := oldRaw.(*infrav1.VSphereClusterTemplate)
5656
if !ok {
5757
return nil, apierrors.NewBadRequest(fmt.Sprintf("expected a VSphereClusterTemplate but got a %T", oldRaw))
@@ -67,6 +67,6 @@ func (webhook *VSphereClusterTemplateWebhook) ValidateUpdate(_ context.Context,
6767
}
6868

6969
// ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
70-
func (webhook *VSphereClusterTemplateWebhook) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
70+
func (webhook *VSphereClusterTemplate) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
7171
return nil, nil
7272
}

‎internal/webhooks/vspheredeploymentzone.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,20 @@ import (
3232

3333
// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta1-vspheredeploymentzone,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=vspheredeploymentzones,versions=v1beta1,name=default.vspheredeploymentzone.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1
3434

35-
// VSphereDeploymentZoneWebhook implements a validation and defaulting webhook for VSphereDeploymentZone.
36-
type VSphereDeploymentZoneWebhook struct{}
35+
// VSphereDeploymentZone implements a defaulting webhook for VSphereDeploymentZone.
36+
type VSphereDeploymentZone struct{}
3737

38-
var _ webhook.CustomDefaulter = &VSphereDeploymentZoneWebhook{}
38+
var _ webhook.CustomDefaulter = &VSphereDeploymentZone{}
3939

40-
func (webhook *VSphereDeploymentZoneWebhook) SetupWebhookWithManager(mgr ctrl.Manager) error {
40+
func (webhook *VSphereDeploymentZone) SetupWebhookWithManager(mgr ctrl.Manager) error {
4141
return ctrl.NewWebhookManagedBy(mgr).
4242
For(&infrav1.VSphereDeploymentZone{}).
4343
WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
4444
Complete()
4545
}
4646

4747
// Default implements webhook.Defaulter so a webhook will be registered for the type.
48-
func (webhook *VSphereDeploymentZoneWebhook) Default(_ context.Context, obj runtime.Object) error {
48+
func (webhook *VSphereDeploymentZone) Default(_ context.Context, obj runtime.Object) error {
4949
typedObj, ok := obj.(*infrav1.VSphereDeploymentZone)
5050
if !ok {
5151
return apierrors.NewBadRequest(fmt.Sprintf("expected a VSphereDeploymentZone but got a %T", obj))

‎internal/webhooks/vspheredeploymentzone_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func TestVSphereDeploymentZone_Default(t *testing.T) {
5555
ControlPlane: tt.boolPtr,
5656
},
5757
}
58-
webhook := VSphereDeploymentZoneWebhook{}
58+
webhook := VSphereDeploymentZone{}
5959
g.Expect(webhook.Default(context.Background(), &vdz)).NotTo(HaveOccurred())
6060
g.Expect(vdz.Spec.ControlPlane).NotTo(BeNil())
6161
g.Expect(*vdz.Spec.ControlPlane).To(Equal(tt.expectedVal))

‎internal/webhooks/vspherefailuredomain.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ import (
3535
// +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta1-vspherefailuredomain,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=vspherefailuredomains,versions=v1beta1,name=validation.vspherefailuredomain.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1
3636
// +kubebuilder:webhook:path=/mutate-infrastructure-cluster-x-k8s-io-v1beta1-vspherefailuredomain,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=vspherefailuredomains,verbs=create;update,versions=v1beta1,name=default.vspherefailuredomain.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1
3737

38-
// VSphereFailureDomainWebhook implements a validation and defaulting webhook for VSphereFailureDomain.
39-
type VSphereFailureDomainWebhook struct{}
38+
// VSphereFailureDomain implements a validation and defaulting webhook for VSphereFailureDomain.
39+
type VSphereFailureDomain struct{}
4040

41-
var _ webhook.CustomValidator = &VSphereFailureDomainWebhook{}
42-
var _ webhook.CustomDefaulter = &VSphereFailureDomainWebhook{}
41+
var _ webhook.CustomValidator = &VSphereFailureDomain{}
42+
var _ webhook.CustomDefaulter = &VSphereFailureDomain{}
4343

44-
func (webhook *VSphereFailureDomainWebhook) SetupWebhookWithManager(mgr ctrl.Manager) error {
44+
func (webhook *VSphereFailureDomain) SetupWebhookWithManager(mgr ctrl.Manager) error {
4545
return ctrl.NewWebhookManagedBy(mgr).
4646
For(&infrav1.VSphereFailureDomain{}).
4747
WithValidator(webhook).
@@ -50,7 +50,7 @@ func (webhook *VSphereFailureDomainWebhook) SetupWebhookWithManager(mgr ctrl.Man
5050
}
5151

5252
// ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
53-
func (webhook *VSphereFailureDomainWebhook) ValidateCreate(_ context.Context, raw runtime.Object) (admission.Warnings, error) {
53+
func (webhook *VSphereFailureDomain) ValidateCreate(_ context.Context, raw runtime.Object) (admission.Warnings, error) {
5454
var allErrs field.ErrorList
5555

5656
obj, ok := raw.(*infrav1.VSphereFailureDomain)
@@ -91,7 +91,7 @@ func (webhook *VSphereFailureDomainWebhook) ValidateCreate(_ context.Context, ra
9191
}
9292

9393
// ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
94-
func (webhook *VSphereFailureDomainWebhook) ValidateUpdate(_ context.Context, oldRaw runtime.Object, newRaw runtime.Object) (admission.Warnings, error) {
94+
func (webhook *VSphereFailureDomain) ValidateUpdate(_ context.Context, oldRaw runtime.Object, newRaw runtime.Object) (admission.Warnings, error) {
9595
oldTyped, ok := oldRaw.(*infrav1.VSphereFailureDomain)
9696
if !ok {
9797
return nil, apierrors.NewBadRequest(fmt.Sprintf("expected a VSphereFailureDomain but got a %T", oldRaw))
@@ -107,12 +107,12 @@ func (webhook *VSphereFailureDomainWebhook) ValidateUpdate(_ context.Context, ol
107107
}
108108

109109
// ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
110-
func (webhook *VSphereFailureDomainWebhook) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
110+
func (webhook *VSphereFailureDomain) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
111111
return nil, nil
112112
}
113113

114114
// Default implements webhook.Defaulter so a webhook will be registered for the type.
115-
func (webhook *VSphereFailureDomainWebhook) Default(_ context.Context, obj runtime.Object) error {
115+
func (webhook *VSphereFailureDomain) Default(_ context.Context, obj runtime.Object) error {
116116
typedObj, ok := obj.(*infrav1.VSphereFailureDomain)
117117
if !ok {
118118
return apierrors.NewBadRequest(fmt.Sprintf("expected a VSphereFailureDomain but got a %T", obj))

0 commit comments

Comments
 (0)