Wire up webhhook with v1beta1

tektoncd · May 26, 2021 · e0dfabd · e0dfabd
1 parent 039b09e
commit e0dfabd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/cmd/webhook/main.go b/cmd/webhook/main.go
@@ -22,6 +22,7 @@ import (
 
 	"github.com/tektoncd/triggers/pkg/apis/triggers/contexts"
 	"github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
+	"github.com/tektoncd/triggers/pkg/apis/triggers/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"knative.dev/pkg/configmap"
 	"knative.dev/pkg/controller"
@@ -43,6 +44,12 @@ var types = map[schema.GroupVersionKind]resourcesemantics.GenericCRD{
 	v1alpha1.SchemeGroupVersion.WithKind("TriggerBinding"):        &v1alpha1.TriggerBinding{},
 	v1alpha1.SchemeGroupVersion.WithKind("TriggerTemplate"):       &v1alpha1.TriggerTemplate{},
 	v1alpha1.SchemeGroupVersion.WithKind("Trigger"):               &v1alpha1.Trigger{},
+
+	v1beta1.SchemeGroupVersion.WithKind("ClusterTriggerBinding"): &v1beta1.ClusterTriggerBinding{},
+	v1beta1.SchemeGroupVersion.WithKind("EventListener"):         &v1beta1.EventListener{},
+	v1beta1.SchemeGroupVersion.WithKind("TriggerBinding"):        &v1beta1.TriggerBinding{},
+	v1beta1.SchemeGroupVersion.WithKind("TriggerTemplate"):       &v1beta1.TriggerTemplate{},
+	v1beta1.SchemeGroupVersion.WithKind("Trigger"):               &v1beta1.Trigger{},
 }
 
 func NewDefaultingAdmissionController(ctx context.Context, cmw configmap.Watcher) *controller.Impl {

diff --git a/pkg/apis/triggers/v1beta1/trigger_types.go b/pkg/apis/triggers/v1beta1/trigger_types.go
@@ -131,13 +131,10 @@ func (ti *TriggerInterceptor) defaultInterceptorKind() {
 
 // GetName returns the name for the given interceptor
 func (ti *TriggerInterceptor) GetName() string {
-	// This is temporary until we implement #869
-	name := ""
-	switch {
-	case ti.Ref.Name != "":
-		name = ti.Ref.Name
+	if ti.Ref.Name != "" {
+		return ti.Ref.Name
 	}
-	return name
+	return ""
 }
 
 // WebhookInterceptor provides a webhook to intercept and pre-process events
@@ -178,7 +175,7 @@ type CELInterceptor struct {
 	Overlays []CELOverlay `json:"overlays,omitempty"`
 }
 
-// CELOverlay provides a way to modify the request body using DeprecatedCEL expressions
+// CELOverlay provides a way to modify the request body using CEL expressions
 type CELOverlay struct {
 	Key        string `json:"key,omitempty"`
 	Expression string `json:"expression,omitempty"`