Merge pull request #532 from mengqiy/webhook_work_with_old_project

k8s-ci-robot · web-flow · commit 3f80c24f2eef · 2018-12-17T10:18:54.000-08:00
make webhook scaffolding work with old project
diff --git a/cmd/webhook.go b/cmd/webhook.go
@@ -29,6 +29,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/kubebuilder/pkg/scaffold"
 	"sigs.k8s.io/kubebuilder/pkg/scaffold/input"
+	"sigs.k8s.io/kubebuilder/pkg/scaffold/manager"
 	"sigs.k8s.io/kubebuilder/pkg/scaffold/resource"
 	"sigs.k8s.io/kubebuilder/pkg/scaffold/webhook"
 )
@@ -58,6 +59,7 @@ Scaffolds webhook handlers based on group, version, kind and other user inputs.
 			}
 
 			err := (&scaffold.Scaffold{}).Execute(input.Options{},
+				&manager.Webhook{},
 				&webhook.AdmissionHandler{Resource: o.res, Config: webhook.Config{Server: o.server, Type: o.webhookType, Operations: o.operations}},
 				&webhook.AdmissionWebhookBuilder{Resource: o.res, Config: webhook.Config{Server: o.server, Type: o.webhookType, Operations: o.operations}},
 				&webhook.AdmissionWebhooks{Resource: o.res, Config: webhook.Config{Server: o.server, Type: o.webhookType, Operations: o.operations}},

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ import (`
`29`	`29`	`"k8s.io/apimachinery/pkg/runtime/schema"`
`30`	`30`	`"sigs.k8s.io/kubebuilder/pkg/scaffold"`
`31`	`31`	`"sigs.k8s.io/kubebuilder/pkg/scaffold/input"`
	`32`	`+ "sigs.k8s.io/kubebuilder/pkg/scaffold/manager"`
`32`	`33`	`"sigs.k8s.io/kubebuilder/pkg/scaffold/resource"`
`33`	`34`	`"sigs.k8s.io/kubebuilder/pkg/scaffold/webhook"`
`34`	`35`	`)`
`@@ -58,6 +59,7 @@ Scaffolds webhook handlers based on group, version, kind and other user inputs.`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`err := (&scaffold.Scaffold{}).Execute(input.Options{},`
	`62`	`+ &manager.Webhook{},`
`61`	`63`	`&webhook.AdmissionHandler{Resource: o.res, Config: webhook.Config{Server: o.server, Type: o.webhookType, Operations: o.operations}},`
`62`	`64`	`&webhook.AdmissionWebhookBuilder{Resource: o.res, Config: webhook.Config{Server: o.server, Type: o.webhookType, Operations: o.operations}},`
`63`	`65`	`&webhook.AdmissionWebhooks{Resource: o.res, Config: webhook.Config{Server: o.server, Type: o.webhookType, Operations: o.operations}},`