Add Choice CRD

cmd/controller/main.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/knative/eventing/pkg/reconciler/broker"
 	"github.com/knative/eventing/pkg/reconciler/channel"
+	"github.com/knative/eventing/pkg/reconciler/choice"
 	"github.com/knative/eventing/pkg/reconciler/eventingchannel"
 	"github.com/knative/eventing/pkg/reconciler/eventtype"
 	"github.com/knative/eventing/pkg/reconciler/namespace"
@@ -42,5 +43,6 @@ func main() {
 		broker.NewController,
 		eventtype.NewController,
 		sequence.NewController,
+		choice.NewController,
 	)
 }

config/200-controller-clusterrole.yaml

@@ -86,13 +86,16 @@ rules:
       - "sequences/status"
       - "channels"
       - "channels/status"
+      - "choices"
+      - "choices/status"
     verbs: *everything
 
   # Messaging resources and finalizers we care about.
   - apiGroups:
       - "messaging.knative.dev"
     resources:
       - "sequences/finalizers"
+      - "choices/finalizers"
     verbs:
       - "update"
 

config/300-choice.yaml

@@ -0,0 +1,133 @@
+# Copyright 2019 The Knative Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: choices.messaging.knative.dev
+  labels:
+    eventing.knative.dev/release: devel
+    knative.dev/crd-install: "true"
+spec:
+  group: messaging.knative.dev
+  version: v1alpha1
+  names:
+    kind: Choice
+    plural: choices
+    singular: choice
+    categories:
+    - all
+    - knative
+    - eventing
+    - messaging
+  scope: Namespaced
+  subresources:
+    status: {}
+  additionalPrinterColumns:
+    - name: Ready
+      type: string
+      JSONPath: ".status.conditions[?(@.type==\"Ready\")].status"
+    - name: Reason
+      type: string
+      JSONPath: ".status.conditions[?(@.type==\"Ready\")].reason"
+    - name: URL
+      type: string
+      JSONPath: .status.address.url
+    - name: Age
+      type: date
+      JSONPath: .metadata.creationTimestamp
+  validation:
+    openAPIV3Schema:
+      properties:
+        spec:
+          required:
+            - cases
+            - channelTemplate
+          properties:
+            cases:
+              type: array
+              items:
+                type: object
+                required:
+                - subscriber
+                properties:
+                  filter:
+                    type: object
+                    properties:
+                      dnsName:
+                        type: string
+                        minLength: 1
+                      uri:
+                        type: string
+                        minLength: 1
+                      ref:
+                        type: object
+                        required:
+                          - apiVersion
+                          - kind
+                          - name
+                        properties:
+                          apiVersion:
+                            type: string
+                            minLength: 1
+                          kind:
+                            type: string
+                            minLength: 1
+                          name:
+                            type: string
+                            minLength: 1
+                          namespace:
+                            type: string
+                            maxLength: 0
+                  subscriber:
+                    type: object
+                    properties:
+                      dnsName:
+                        type: string
+                        minLength: 1
+                      uri:
+                        type: string
+                        minLength: 1
+                      ref:
+                        type: object
+                        required:
+                          - apiVersion
+                          - kind
+                          - name
+                        properties:
+                          apiVersion:
+                            type: string
+                            minLength: 1
+                          kind:
+                            type: string
+                            minLength: 1
+                          name:
+                            type: string
+                            minLength: 1
+                          namespace:
+                            type: string
+                            maxLength: 0
+            channelTemplate:
+              type: object
+              required:
+                - apiVersion
+                - kind
+              properties:
+                apiVersion:
+                  type: string
+                  minLength: 1
+                kind:
+                  type: string
+                  minLength: 1
+                spec:
+                  type: object

pkg/apis/messaging/v1alpha1/choice_defaults.go

@@ -0,0 +1,37 @@
+/*
+Copyright 2019 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	"context"
+
+	eventingduckv1alpha1 "github.com/knative/eventing/pkg/apis/duck/v1alpha1"
+)
+
+func (s *Choice) SetDefaults(ctx context.Context) {
+	if s != nil && s.Spec.ChannelTemplate == nil {
+		// The singleton may not have been set, if so ignore it and validation will reject the
+		// Channel.
+		if cd := eventingduckv1alpha1.ChannelDefaulterSingleton; cd != nil {
+			channelTemplate := cd.GetDefault(s.Namespace)
+			s.Spec.ChannelTemplate = channelTemplate
+		}
+	}
+	s.Spec.SetDefaults(ctx)
+}
+
+func (ss *ChoiceSpec) SetDefaults(ctx context.Context) {}

pkg/apis/messaging/v1alpha1/choice_defaults_test.go

@@ -0,0 +1,97 @@
+/*
+Copyright 2019 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	"context"
+	"testing"
+
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/google/go-cmp/cmp"
+	eventingduckv1alpha1 "github.com/knative/eventing/pkg/apis/duck/v1alpha1"
+)
+
+func TestChoiceSetDefaults(t *testing.T) {
+	testCases := map[string]struct {
+		nilChannelDefaulter bool
+		channelTemplate     *eventingduckv1alpha1.ChannelTemplateSpec
+		initial             Choice
+		expected            Choice
+	}{
+		"nil ChannelDefaulter": {
+			nilChannelDefaulter: true,
+			expected:            Choice{},
+		},
+		"unset ChannelDefaulter": {
+			expected: Choice{},
+		},
+		"set ChannelDefaulter": {
+			channelTemplate: defaultChannelTemplate,
+			expected: Choice{
+				Spec: ChoiceSpec{
+					ChannelTemplate: defaultChannelTemplate,
+				},
+			},
+		},
+		"template already specified": {
+			channelTemplate: defaultChannelTemplate,
+			initial: Choice{
+				Spec: ChoiceSpec{
+					ChannelTemplate: &eventingduckv1alpha1.ChannelTemplateSpec{
+						TypeMeta: v1.TypeMeta{
+							APIVersion: SchemeGroupVersion.String(),
+							Kind:       "OtherChannel",
+						},
+					},
+				},
+			},
+			expected: Choice{
+				Spec: ChoiceSpec{
+					ChannelTemplate: &eventingduckv1alpha1.ChannelTemplateSpec{
+						TypeMeta: v1.TypeMeta{
+							APIVersion: SchemeGroupVersion.String(),
+							Kind:       "OtherChannel",
+						},
+					},
+				},
+			},
+		},
+	}
+	for n, tc := range testCases {
+		t.Run(n, func(t *testing.T) {
+			if !tc.nilChannelDefaulter {
+				eventingduckv1alpha1.ChannelDefaulterSingleton = &choiceChannelDefaulter{
+					channelTemplate: tc.channelTemplate,
+				}
+				defer func() { eventingduckv1alpha1.ChannelDefaulterSingleton = nil }()
+			}
+			tc.initial.SetDefaults(context.TODO())
+			if diff := cmp.Diff(tc.expected, tc.initial); diff != "" {
+				t.Fatalf("Unexpected defaults (-want, +got): %s", diff)
+			}
+		})
+	}
+}
+
+type choiceChannelDefaulter struct {
+	channelTemplate *eventingduckv1alpha1.ChannelTemplateSpec
+}
+
+func (cd *choiceChannelDefaulter) GetDefault(_ string) *eventingduckv1alpha1.ChannelTemplateSpec {
+	return cd.channelTemplate
+}