Bump knative.dev/pkg to 528ad1c 🔥

Gopkg.toml

@@ -79,8 +79,8 @@ required = [
 
 [[override]]
   name = "knative.dev/pkg"
-  # HEAD as of 2019-07-23 💖
-  revision = "e4bc08cc8deda3eac40a8d53984d09c9d0e1ad48"
+  # HEAD as of 2019-09-09 💖
+  revision = "528ad1c1dd627059b95aef17ccf27f9ab0f46c10"
 
 [[override]]
   name = "knative.dev/eventing-contrib"

cmd/webhook/main.go

@@ -79,32 +79,37 @@ func main() {
 	}
 
 	options := webhook.ControllerOptions{
-		ServiceName:    "tekton-pipelines-webhook",
-		DeploymentName: "tekton-pipelines-webhook",
-		Namespace:      system.GetNamespace(),
-		Port:           8443,
-		SecretName:     "webhook-certs",
-		WebhookName:    "webhook.tekton.dev",
+		ServiceName:                     "tekton-pipelines-webhook",
+		DeploymentName:                  "tekton-pipelines-webhook",
+		Namespace:                       system.GetNamespace(),
+		Port:                            8443,
+		SecretName:                      "webhook-certs",
+		WebhookName:                     "webhook.tekton.dev",
+		ResourceAdmissionControllerPath: "/",
 	}
-	//TODO add validations here
-	controller := webhook.AdmissionController{
-		Client:  kubeClient,
-		Options: options,
-		Handlers: map[schema.GroupVersionKind]webhook.GenericCRD{
-			v1alpha1.SchemeGroupVersion.WithKind("Pipeline"):         &v1alpha1.Pipeline{},
-			v1alpha1.SchemeGroupVersion.WithKind("PipelineResource"): &v1alpha1.PipelineResource{},
-			v1alpha1.SchemeGroupVersion.WithKind("Task"):             &v1alpha1.Task{},
-			v1alpha1.SchemeGroupVersion.WithKind("ClusterTask"):      &v1alpha1.ClusterTask{},
-			v1alpha1.SchemeGroupVersion.WithKind("TaskRun"):          &v1alpha1.TaskRun{},
-			v1alpha1.SchemeGroupVersion.WithKind("PipelineRun"):      &v1alpha1.PipelineRun{},
-			v1alpha1.SchemeGroupVersion.WithKind("Condition"):        &v1alpha1.Condition{},
-		},
-		Logger:                logger,
-		DisallowUnknownFields: true,
-		// Decorate contexts with the current state of the config.
-		WithContext: func(ctx context.Context) context.Context {
-			return v1alpha1.WithDefaultConfigurationName(store.ToContext(ctx))
-		},
+	resourceHandlers := map[schema.GroupVersionKind]webhook.GenericCRD{
+		v1alpha1.SchemeGroupVersion.WithKind("Pipeline"):         &v1alpha1.Pipeline{},
+		v1alpha1.SchemeGroupVersion.WithKind("PipelineResource"): &v1alpha1.PipelineResource{},
+		v1alpha1.SchemeGroupVersion.WithKind("Task"):             &v1alpha1.Task{},
+		v1alpha1.SchemeGroupVersion.WithKind("ClusterTask"):      &v1alpha1.ClusterTask{},
+		v1alpha1.SchemeGroupVersion.WithKind("TaskRun"):          &v1alpha1.TaskRun{},
+		v1alpha1.SchemeGroupVersion.WithKind("PipelineRun"):      &v1alpha1.PipelineRun{},
+		v1alpha1.SchemeGroupVersion.WithKind("Condition"):        &v1alpha1.Condition{},
+	}
+
+	resourceAdmissionController := webhook.NewResourceAdmissionController(resourceHandlers, options, true)
+	admissionControllers := map[string]webhook.AdmissionController{
+		options.ResourceAdmissionControllerPath: resourceAdmissionController,
+	}
+
+	// Decorate contexts with the current state of the config.
+	ctxFunc := func(ctx context.Context) context.Context {
+		return v1alpha1.WithDefaultConfigurationName(store.ToContext(ctx))
+	}
+
+	controller, err := webhook.New(kubeClient, options, admissionControllers, logger, ctxFunc)
+	if err != nil {
+		logger.Fatal("Error creating admission controller", zap.Error(err))
 	}
 
 	if err := controller.Run(stopCh); err != nil {