Merge pull request #507 from kubernetes-sigs/master

🏃 ff release-0.2 to master

Author: k8s-ci-robot

.gitignore

@@ -16,3 +16,6 @@
 *.swp
 *.swo
 *~
+
+# Vscode files
+.vscode

Gopkg.lock

@@ -94,6 +94,9 @@ var (
 	// NewControllerManagedBy returns a new controller builder that will be started by the provided Manager
 	NewControllerManagedBy = builder.ControllerManagedBy
 
+	// NewWebhookManagedBy returns a new webhook builder that will be started by the provided Manager
+	NewWebhookManagedBy = builder.WebhookManagedBy
+
 	// NewManager returns a new Manager for creating Controllers.
 	NewManager = manager.New
 

alias.go

@@ -78,18 +78,11 @@ func main() {
 
 	// Setup webhooks
 	entryLog.Info("setting up webhook server")
-	hookServer := &webhook.Server{
-		Port:    9876,
-		CertDir: "/tmp/cert",
-	}
-	if err := mgr.Add(hookServer); err != nil {
-		entryLog.Error(err, "unable register webhook server with manager")
-		os.Exit(1)
-	}
+	hookServer := mgr.GetWebhookServer()
 
 	entryLog.Info("registering webhooks to the webhook server")
-	hookServer.Register("/mutate-pods", &webhook.Admission{Handler: &podAnnotator{}})
-	hookServer.Register("/validate-pods", &webhook.Admission{Handler: &podValidator{}})
+	hookServer.Register("/mutate-v1-pod", &webhook.Admission{Handler: &podAnnotator{}})
+	hookServer.Register("/validate-v1-pod", &webhook.Admission{Handler: &podValidator{}})
 
 	entryLog.Info("starting manager")
 	if err := mgr.Start(signals.SetupSignalHandler()); err != nil {

examples/builtins/main.go

@@ -26,6 +26,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
+// +kubebuilder:webhook:path=/mutate-v1-pod,mutating=true,failurePolicy=fail,groups="",resources=pods,verbs=create;update,versions=v1,name=mpod.kb.io
+
 // podAnnotator annotates Pods
 type podAnnotator struct {
 	client  client.Client

examples/builtins/mutatingwebhook.go

@@ -26,6 +26,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
+// +kubebuilder:webhook:path=/validate-v1-pod,mutating=false,failurePolicy=fail,groups="",resources=pods,verbs=create;update,versions=v1,name=vpod.kb.io
+
 // podValidator validates Pods
 type podValidator struct {
 	client  client.Client