Cluster scoped Bus

cmd/controller/main.go

@@ -38,6 +38,7 @@ import (
 	"github.com/knative/eventing/pkg/controller/bind"
 	"github.com/knative/eventing/pkg/controller/bus"
 	"github.com/knative/eventing/pkg/controller/channel"
+	"github.com/knative/eventing/pkg/controller/clusterbus"
 	"github.com/knative/eventing/pkg/signals"
 
 	"github.com/prometheus/client_golang/prometheus/promhttp"
@@ -88,6 +89,7 @@ func main() {
 	ctors := []controller.Constructor{
 		bind.NewController,
 		bus.NewController,
+		clusterbus.NewController,
 		channel.NewController,
 	}
 

config/clusterbus.yaml

@@ -0,0 +1,25 @@
+# Copyright 2018 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: clusterbuses.channels.knative.dev
+spec:
+  scope: Cluster
+  group: channels.knative.dev
+  version: v1alpha1
+  names:
+    kind: ClusterBus
+    plural: clusterbuses
+    singular: clusterbus

config/clusterrole.yaml

@@ -17,7 +17,7 @@ metadata:
   name: knative-channels-bus
 rules:
 - apiGroups: ["channels.knative.dev"]
-  resources: ["buses", "channels", "subscriptions"]
+  resources: ["buses", "clusterbuses", "channels", "subscriptions"]
   verbs: ["get", "watch", "list"]
 - apiGroups: [""]
   resources: ["events"]

config/clusterrolebinding.yaml

@@ -23,3 +23,17 @@ roleRef:
   kind: ClusterRole
   name: cluster-admin
   apiGroup: rbac.authorization.k8s.io
+
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: clusterbus-controller-manage
+subjects:
+  - kind: ServiceAccount
+    name: clusterbus-controller
+    namespace: knative-eventing
+roleRef:
+  kind: ClusterRole
+  name: knative-channels-bus
+  apiGroup: rbac.authorization.k8s.io

config/serviceaccount.yaml

@@ -16,3 +16,10 @@ kind: ServiceAccount
 metadata:
   name: bind-controller
   namespace: knative-eventing
+
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: clusterbus-controller
+  namespace: knative-eventing

pkg/apis/channels/v1alpha1/bus_types.go

@@ -21,6 +21,7 @@ import (
 
 	kapi "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
 // +genclient
@@ -32,8 +33,8 @@ import (
 type Bus struct {
 	meta_v1.TypeMeta   `json:",inline"`
 	meta_v1.ObjectMeta `json:"metadata"`
-	Spec               BusSpec    `json:"spec"`
-	Status             *BusStatus `json:"status,omitempty"`
+	Spec               BusSpec   `json:"spec"`
+	Status             BusStatus `json:"status,omitempty"`
 }
 
 // BusSpec (what the user wants) for a bus
@@ -66,6 +67,14 @@ type BusParameters struct {
 type BusStatus struct {
 }
 
+func (b *Bus) BacksChannel(channel *Channel) bool {
+	return b.Namespace == channel.Namespace && b.Name == channel.Spec.Bus
+}
+
+func (b *Bus) GetSpec() *BusSpec {
+	return &b.Spec
+}
+
 func (b *Bus) GetSpecJSON() ([]byte, error) {
 	return json.Marshal(b.Spec)
 }
@@ -78,3 +87,11 @@ type BusList struct {
 	meta_v1.ListMeta `json:"metadata"`
 	Items            []Bus `json:"items"`
 }
+
+// GenericBus may be backed by Bus or ClusterBus
+type GenericBus interface {
+	runtime.Object
+	meta_v1.ObjectMetaAccessor
+	BacksChannel(channel *Channel) bool
+	GetSpec() *BusSpec
+}

pkg/apis/channels/v1alpha1/channel_types.go

@@ -31,15 +31,18 @@ import (
 type Channel struct {
 	meta_v1.TypeMeta   `json:",inline"`
 	meta_v1.ObjectMeta `json:"metadata"`
-	Spec               ChannelSpec    `json:"spec"`
-	Status             *ChannelStatus `json:"status,omitempty"`
+	Spec               ChannelSpec   `json:"spec"`
+	Status             ChannelStatus `json:"status,omitempty"`
 }
 
 // ChannelSpec (what the user wants) for a channel
 type ChannelSpec struct {
 
-	// Name of the bus backing this channel (optional)
-	Bus string `json:"bus`
+	// Bus name of the bus backing this channel (mutually exclusive with ClusterBus)
+	Bus string `json:"bus"`
+
+	// ClusterBus name of the clusterbus backing this channel (mutually exclusive with Bus)
+	ClusterBus string `json:"clusterBus"`
 
 	// Arguments configuration arguments for the channel
 	Arguments *[]Argument `json:"arguments,omitempty"`

pkg/apis/channels/v1alpha1/clusterbus_types.go

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2018 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 (
+	"encoding/json"
+
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// +genclient
+// +genclient:noStatus
+// +genclient:nonNamespaced
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +k8s:defaulter-gen=true
+
+// ClusterBus represents the clusterbuses.channels.knative.dev CRD
+type ClusterBus struct {
+	meta_v1.TypeMeta   `json:",inline"`
+	meta_v1.ObjectMeta `json:"metadata"`
+	Spec               ClusterBusSpec   `json:"spec"`
+	Status             ClusterBusStatus `json:"status,omitempty"`
+}
+
+// ClusterBusSpec (what the user wants) for a clusterbus
+type ClusterBusSpec = BusSpec
+
+// ClusterBusStatus (computed) for a clusterbus
+type ClusterBusStatus struct {
+}
+
+func (b *ClusterBus) BacksChannel(channel *Channel) bool {
+	return len(b.Namespace) == 0 && b.Name == channel.Spec.ClusterBus
+}
+
+func (b *ClusterBus) GetSpec() *BusSpec {
+	return &b.Spec
+}
+
+func (b *ClusterBus) GetSpecJSON() ([]byte, error) {
+	return json.Marshal(b.Spec)
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// ClusterBusList returned in list operations
+type ClusterBusList struct {
+	meta_v1.TypeMeta `json:",inline"`
+	meta_v1.ListMeta `json:"metadata"`
+	Items            []ClusterBus `json:"items"`
+}

pkg/apis/channels/v1alpha1/register.go

@@ -47,6 +47,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Bus{},
 		&BusList{},
+		&ClusterBus{},
+		&ClusterBusList{},
 		&Channel{},
 		&ChannelList{},
 		&Subscription{},

pkg/apis/channels/v1alpha1/subscription_types.go

@@ -31,8 +31,8 @@ import (
 type Subscription struct {
 	meta_v1.TypeMeta   `json:",inline"`
 	meta_v1.ObjectMeta `json:"metadata"`
-	Spec               SubscriptionSpec    `json:"spec"`
-	Status             *SubscriptionStatus `json:"status,omitempty"`
+	Spec               SubscriptionSpec   `json:"spec"`
+	Status             SubscriptionStatus `json:"status,omitempty"`
 }
 
 // SubscriptionSpec (what the user wants) for a subscription