✨ scaffold ValidateDelete for validating webhook

Mengqi Yu · Mengqi Yu · commit ef48443aa673 · 2019-08-07T11:17:42.000-07:00
diff --git a/pkg/scaffold/v2/gomod.go b/pkg/scaffold/v2/gomod.go
@@ -43,6 +43,6 @@ module {{ .Repo }}
 go 1.12
 
 require (
-	sigs.k8s.io/controller-runtime v0.2.0-beta.4
+	sigs.k8s.io/controller-runtime v0.2.0-beta.5
 )
 `
diff --git a/pkg/scaffold/v2/webhook/webhook.go b/pkg/scaffold/v2/webhook/webhook.go
@@ -118,7 +118,8 @@ func (r *{{ .Resource.Kind }}) Default() {
 `
 
 	ValidatingWebhookTemplate = `
-// +kubebuilder:webhook:path=/validate-{{ .GroupDomainWithDash }}-{{ .Resource.Version }}-{{ lower .Resource.Kind }},mutating=false,failurePolicy=fail,groups={{ .GroupDomain }},resources={{ .Plural }},verbs=create;update,versions={{ .Resource.Version }},name=v{{ lower .Resource.Kind }}.kb.io
+// TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
+// +kubebuilder:webhook:verbs=create;update,path=/validate-{{ .GroupDomainWithDash }}-{{ .Resource.Version }}-{{ lower .Resource.Kind }},mutating=false,failurePolicy=fail,groups={{ .GroupDomain }},resources={{ .Plural }},versions={{ .Resource.Version }},name=v{{ lower .Resource.Kind }}.kb.io
 
 var _ webhook.Validator = &{{ .Resource.Kind }}{}
 
@@ -137,5 +138,13 @@ func (r *{{ .Resource.Kind }}) ValidateUpdate(old runtime.Object) error {
 	// TODO(user): fill in your validation logic upon object update.
 	return nil
 }
+
+// ValidateDelete implements webhook.Validator so a webhook will be registered for the type
+func (r *{{ .Resource.Kind }}) ValidateDelete() error {
+	{{ lower .Resource.Kind }}log.Info("validate delete", "name", r.Name)
+
+	// TODO(user): fill in your validation logic upon object deletion.
+	return nil
+}
 `
 )
diff --git a/testdata/project-v2/api/v1/captain_webhook.go b/testdata/project-v2/api/v1/captain_webhook.go
@@ -45,7 +45,8 @@ func (r *Captain) Default() {
 	// TODO(user): fill in your defaulting logic.
 }
 
-// +kubebuilder:webhook:path=/validate-crew-testproject-org-v1-captain,mutating=false,failurePolicy=fail,groups=crew.testproject.org,resources=captains,verbs=create;update,versions=v1,name=vcaptain.kb.io
+// TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
+// +kubebuilder:webhook:verbs=create;update,path=/validate-crew-testproject-org-v1-captain,mutating=false,failurePolicy=fail,groups=crew.testproject.org,resources=captains,versions=v1,name=vcaptain.kb.io
 
 var _ webhook.Validator = &Captain{}
 
@@ -64,3 +65,11 @@ func (r *Captain) ValidateUpdate(old runtime.Object) error {
 	// TODO(user): fill in your validation logic upon object update.
 	return nil
 }
+
+// ValidateDelete implements webhook.Validator so a webhook will be registered for the type
+func (r *Captain) ValidateDelete() error {
+	captainlog.Info("validate delete", "name", r.Name)
+
+	// TODO(user): fill in your validation logic upon object deletion.
+	return nil
+}
diff --git a/testdata/project-v2/go.mod b/testdata/project-v2/go.mod
@@ -9,5 +9,5 @@ require (
 	k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b
 	k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
 	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
-	sigs.k8s.io/controller-runtime v0.2.0-beta.4
+	sigs.k8s.io/controller-runtime v0.2.0-beta.5
 )
diff --git a/testdata/project-v2/go.sum b/testdata/project-v2/go.sum
@@ -116,8 +116,8 @@ k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c h1:3KSCztE7gPitlZmWbNwue/
 k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
 k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5 h1:VBM/0P5TWxwk+Nw6Z+lAw3DKgO76g90ETOiA6rfLV1Y=
 k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
-sigs.k8s.io/controller-runtime v0.2.0-beta.4 h1:S1XVfRWR1MuIXZdkYx3jN8JDw+bbQxmWZroy0i87z/A=
-sigs.k8s.io/controller-runtime v0.2.0-beta.4/go.mod h1:HweyYKQ8fBuzdu2bdaeBJvsFgAi/OqBBnrVGXcqKhME=
+sigs.k8s.io/controller-runtime v0.2.0-beta.5 h1:W2jTb239QEwQ+HejhTCF9GriFPy2zmo1I6pPmJTeEy8=
+sigs.k8s.io/controller-runtime v0.2.0-beta.5/go.mod h1:HweyYKQ8fBuzdu2bdaeBJvsFgAi/OqBBnrVGXcqKhME=
 sigs.k8s.io/testing_frameworks v0.1.1 h1:cP2l8fkA3O9vekpy5Ks8mmA0NW/F7yBdXf8brkWhVrs=
 sigs.k8s.io/testing_frameworks v0.1.1/go.mod h1:VVBKrHmJ6Ekkfz284YKhQePcdycOzNH9qL6ht1zEr/U=
 sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,6 @@ module {{ .Repo }}`
`43`	`43`	`go 1.12`
`44`	`44`
`45`	`45`	`require (`
`46`		`- sigs.k8s.io/controller-runtime v0.2.0-beta.4`
	`46`	`+ sigs.k8s.io/controller-runtime v0.2.0-beta.5`
`47`	`47`	`)`
`48`	`48`	`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,8 @@ func (r *{{ .Resource.Kind }}) Default() {`
`118`	`118`	`
`119`	`119`
`120`	`120`	ValidatingWebhookTemplate = `
`121`		`-// +kubebuilder:webhook:path=/validate-{{ .GroupDomainWithDash }}-{{ .Resource.Version }}-{{ lower .Resource.Kind }},mutating=false,failurePolicy=fail,groups={{ .GroupDomain }},resources={{ .Plural }},verbs=create;update,versions={{ .Resource.Version }},name=v{{ lower .Resource.Kind }}.kb.io`
	`121`	`+// TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.`
	`122`	`+// +kubebuilder:webhook:verbs=create;update,path=/validate-{{ .GroupDomainWithDash }}-{{ .Resource.Version }}-{{ lower .Resource.Kind }},mutating=false,failurePolicy=fail,groups={{ .GroupDomain }},resources={{ .Plural }},versions={{ .Resource.Version }},name=v{{ lower .Resource.Kind }}.kb.io`
`122`	`123`
`123`	`124`	`var _ webhook.Validator = &{{ .Resource.Kind }}{}`
`124`	`125`
`@@ -137,5 +138,13 @@ func (r *{{ .Resource.Kind }}) ValidateUpdate(old runtime.Object) error {`
`137`	`138`	`// TODO(user): fill in your validation logic upon object update.`
`138`	`139`	`return nil`
`139`	`140`	`}`
	`141`	`+`
	`142`	`+// ValidateDelete implements webhook.Validator so a webhook will be registered for the type`
	`143`	`+func (r *{{ .Resource.Kind }}) ValidateDelete() error {`
	`144`	`+ {{ lower .Resource.Kind }}log.Info("validate delete", "name", r.Name)`
	`145`	`+`
	`146`	`+ // TODO(user): fill in your validation logic upon object deletion.`
	`147`	`+ return nil`
	`148`	`+}`
`140`	`149`	`
`141`	`150`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@ require (`
`9`	`9`	`k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b`
`10`	`10`	`k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d`
`11`	`11`	`k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible`
`12`		`- sigs.k8s.io/controller-runtime v0.2.0-beta.4`
	`12`	`+ sigs.k8s.io/controller-runtime v0.2.0-beta.5`
`13`	`13`	`)`