Remove duplicated default configmaps, and stash them in core

config/400-config-br-defaults.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
+#
+#     https://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: v1
+kind: ConfigMap
+metadata:
+  name: config-br-defaults
+  namespace: knative-eventing
+data:
+  # Configuration for defaulting channels that do not specify CRD implementations.
+  default-br-config: |
+    clusterDefault:
+      brokerClass: ChannelBasedBroker
+      apiVersion: v1
+      kind: ConfigMap
+      name: config-br-default-channel
+      namespace: knative-eventing

hack/release.sh

@@ -33,8 +33,7 @@ readonly COMPONENTS
 
 declare -A RELEASES
 RELEASES=(
-  ["eventing.yaml"]="eventing-core.yaml channel-broker.yaml in-memory-channel.yaml"
-  ["eventing-mt.yaml"]="eventing-core.yaml mt-channel-broker.yaml in-memory-channel.yaml"
+  ["eventing.yaml"]="eventing-core.yaml channel-broker.yaml mt-channel-broker.yaml in-memory-channel.yaml"
 )
 readonly RELEASES
 

test/e2e-common.sh

@@ -35,6 +35,8 @@ readonly IN_MEMORY_CHANNEL_CRD_CONFIG_DIR="config/channels/in-memory-channel"
 
 # MT Channel Based Broker config.
 readonly MT_CHANNEL_BASED_BROKER_CONFIG_DIR="config/brokers/mt-channel-broker"
+# MT Channel Based Broker config.
+readonly MT_CHANNEL_BASED_BROKER_DEFAULT_CONFIG="test/config/mt-channel-broker.yaml"
 
 # Channel Based Broker Controller.
 readonly CHANNEL_BASED_BROKER_CONTROLLER="config/brokers/channel-broker"
@@ -60,6 +62,7 @@ function install_broker() {
 }
 
 function install_mt_broker() {
+  ko apply --strict -f ${MT_CHANNEL_BASED_BROKER_DEFAULT_CONFIG} || return 1
   ko apply --strict -f ${MT_CHANNEL_BASED_BROKER_CONFIG_DIR} || return 1
   wait_until_pods_running knative-eventing || fail_test "Knative Eventing with MT Broker did not come up"
 }