Split the channel broker off from eventing core

cmd/channel_broker/kodata/HEAD

@@ -0,0 +1 @@
+../../../.git/HEAD

cmd/channel_broker/kodata/LICENSE

@@ -0,0 +1 @@
+../../../LICENSE

cmd/channel_broker/kodata/VENDOR-LICENSE

@@ -0,0 +1 @@
+../../../third_party/VENDOR-LICENSE

cmd/channel_broker/kodata/refs

@@ -0,0 +1 @@
+../../../.git/refs/

cmd/channel_broker/main.go

@@ -0,0 +1,41 @@
+/*
+Copyright 2020 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 main
+
+import (
+	// Uncomment the following line to load the gcp plugin (only required to authenticate against GKE clusters).
+	// _ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
+
+	"knative.dev/pkg/injection/sharedmain"
+
+	"knative.dev/eventing/pkg/reconciler/broker"
+	"knative.dev/eventing/pkg/reconciler/configmappropagation"
+	"knative.dev/eventing/pkg/reconciler/namespace"
+	"knative.dev/eventing/pkg/reconciler/trigger"
+)
+
+func main() {
+	sharedmain.Main("controller",
+		// Eventing
+		namespace.NewController,
+		broker.NewController,
+		trigger.NewController,
+
+		// Utility for sole-tenancy brokers.
+		configmappropagation.NewController,
+	)
+}

cmd/controller/main.go

@@ -23,36 +23,28 @@ import (
 	"knative.dev/pkg/injection/sharedmain"
 
 	"knative.dev/eventing/pkg/reconciler/apiserversource"
-	"knative.dev/eventing/pkg/reconciler/broker"
 	"knative.dev/eventing/pkg/reconciler/channel"
-	"knative.dev/eventing/pkg/reconciler/configmappropagation"
 	"knative.dev/eventing/pkg/reconciler/eventtype"
 	"knative.dev/eventing/pkg/reconciler/legacyapiserversource"
 	"knative.dev/eventing/pkg/reconciler/legacycontainersource"
 	"knative.dev/eventing/pkg/reconciler/legacycronjobsource"
-	"knative.dev/eventing/pkg/reconciler/namespace"
 	"knative.dev/eventing/pkg/reconciler/parallel"
 	"knative.dev/eventing/pkg/reconciler/pingsource"
 	"knative.dev/eventing/pkg/reconciler/sequence"
 	"knative.dev/eventing/pkg/reconciler/subscription"
-	"knative.dev/eventing/pkg/reconciler/trigger"
 )
 
 func main() {
 	sharedmain.Main("controller",
 		// Messaging
-		namespace.NewController,
 		channel.NewController,
 
 		// Eventing
 		subscription.NewController,
-		trigger.NewController,
-		broker.NewController,
 		eventtype.NewController,
 
 		// Flows
 		parallel.NewController,
-		configmappropagation.NewController,
 		sequence.NewController,
 
 		// Sources

config/200-channel-broker-binding.yaml

@@ -0,0 +1 @@
+brokers/channel-broker/200-channel-broker-binding.yaml

config/200-channel-broker-clusterrole.yaml

@@ -0,0 +1 @@
+brokers/channel-broker/roles/controller-clusterroles.yaml

config/300-configmappropagation.yaml

@@ -1 +1 @@
-core/resources/configmappropagation.yaml
+brokers/channel-broker/resources/configmappropagation.yaml

config/500-broker-controller.yaml

@@ -0,0 +1 @@
+brokers/channel-broker/deployments/controller.yaml

config/brokers/channel-broker/200-channel-broker-binding.yaml

@@ -0,0 +1,28 @@
+# Copyright 2020 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: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: eventing-channel-broker-controller
+  labels:
+    eventing.knative.dev/release: devel
+subjects:
+  - kind: ServiceAccount
+    name: eventing-controller
+    namespace: knative-eventing
+roleRef:
+  kind: ClusterRole
+  name: knative-eventing-channel-broker-controller
+  apiGroup: rbac.authorization.k8s.io

config/brokers/channel-broker/deployments/controller.yaml

@@ -0,0 +1,75 @@
+# 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: apps/v1
+kind: Deployment
+metadata:
+  name: broker-controller
+  namespace: knative-eventing
+  labels:
+    eventing.knative.dev/release: devel
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: broker-controller
+  template:
+    metadata:
+      labels:
+        app: broker-controller
+        eventing.knative.dev/release: devel
+    spec:
+      serviceAccountName: eventing-controller
+
+      containers:
+      - name: eventing-controller
+        terminationMessagePolicy: FallbackToLogsOnError
+        image: knative.dev/eventing/cmd/channel_broker
+
+        resources:
+          requests:
+            cpu: 100m
+            memory: 100Mi
+
+        env:
+          - name: SYSTEM_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
+          - name: CONFIG_LOGGING_NAME
+            value: config-logging
+          - name: CONFIG_OBSERVABILITY_NAME
+            value: config-observability
+          - name: METRICS_DOMAIN
+            value: knative.dev/eventing
+          # Broker
+          - name: BROKER_INGRESS_IMAGE
+            value: knative.dev/eventing/cmd/broker/ingress
+          - name: BROKER_INGRESS_SERVICE_ACCOUNT
+            value: eventing-broker-ingress
+          - name: BROKER_FILTER_IMAGE
+            value: knative.dev/eventing/cmd/broker/filter
+          - name: BROKER_FILTER_SERVICE_ACCOUNT
+            value: eventing-broker-filter
+          - name: BROKER_IMAGE_PULL_SECRET_NAME
+            value:
+
+        securityContext:
+          allowPrivilegeEscalation: false
+
+        ports:
+        - name: metrics
+          containerPort: 9090
+        - name: profiling
+          containerPort: 8008

config/brokers/channel-broker/roles/controller-clusterroles.yaml

@@ -0,0 +1,35 @@
+# Copyright 2020 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: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: knative-eventing-channel-broker-controller
+  labels:
+    eventing.knative.dev/release: devel
+rules:
+  # Configs resources and status we care about.
+  - apiGroups:
+      - "configs.internal.knative.dev"
+    resources:
+      - "configmappropagations"
+      - "configmappropagations/status"
+    verbs:
+      - "get"
+      - "list"
+      - "create"
+      - "update"
+      - "delete"
+      - "patch"
+      - "watch"

config/core/deployments/controller.yaml

@@ -53,17 +53,6 @@ spec:
             value: config-observability
           - name: METRICS_DOMAIN
             value: knative.dev/eventing
-          # Broker
-          - name: BROKER_INGRESS_IMAGE
-            value: knative.dev/eventing/cmd/broker/ingress
-          - name: BROKER_INGRESS_SERVICE_ACCOUNT
-            value: eventing-broker-ingress
-          - name: BROKER_FILTER_IMAGE
-            value: knative.dev/eventing/cmd/broker/filter
-          - name: BROKER_FILTER_SERVICE_ACCOUNT
-            value: eventing-broker-filter
-          - name: BROKER_IMAGE_PULL_SECRET_NAME
-            value:
           # Legacy CronJobSource
           - name: CRONJOB_RA_IMAGE
             value: knative.dev/eventing/cmd/cronjob_receive_adapter

config/core/roles/controller-clusterroles.yaml

@@ -96,14 +96,6 @@ rules:
       - "parallels/status"
     verbs: *everything
 
-  # Configs resources and status we care about.
-  - apiGroups:
-      - "configs.internal.knative.dev"
-    resources:
-      - "configmappropagations"
-      - "configmappropagations/status"
-    verbs: *everything
-
   # Messaging resources and finalizers we care about.
   - apiGroups:
       - "messaging.knative.dev"

hack/release.sh

@@ -22,15 +22,16 @@ source $(dirname $0)/../vendor/knative.dev/test-infra/scripts/release.sh
 # Yaml files to generate, and the source config dir for them.
 declare -A COMPONENTS
 COMPONENTS=(
-  ["eventing-core.yaml"]="config"
+  ["eventing-core.yaml"]="config/core"
   ["eventing-crds.yaml"]="config/core/resources"
+  ["channel-broker.yaml"]="config/brokers/channel-broker"
   ["in-memory-channel.yaml"]="config/channels/in-memory-channel"
 )
 readonly COMPONENTS
 
 declare -A RELEASES
 RELEASES=(
-  ["eventing.yaml"]="eventing-core.yaml in-memory-channel.yaml"
+  ["eventing.yaml"]="eventing-core.yaml channel-broker.yaml in-memory-channel.yaml"
 )
 readonly RELEASES
 
@@ -49,7 +50,7 @@ function build_release() {
   for yaml in "${!COMPONENTS[@]}"; do
     local config="${COMPONENTS[${yaml}]}"
     echo "Building Knative Eventing - ${config}"
-    ko resolve ${KO_FLAGS} -f ${config}/ | "${LABEL_YAML_CMD[@]}" > ${yaml}
+    ko resolve ${KO_FLAGS} -R -f ${config}/ | "${LABEL_YAML_CMD[@]}" > ${yaml}
     all_yamls+=(${yaml})
   done
   # Assemble the release