I did not realize testing installed knative eventing into another namespace. sed rename like the other installs.

Author: Scott Nichols

test/e2e-common.sh

@@ -42,6 +42,7 @@ readonly MT_CHANNEL_BASED_BROKER_DEFAULT_CONFIG="config/core/configmaps/default-
 
 # Sugar Controller config. For label/annotation magic.
 readonly SUGAR_CONTROLLER_CONFIG_DIR="config/sugar"
+readonly SUGAR_CONTROLLER_CONFIG="config/sugar/500-controller.yaml"
 
 # Channel Based Broker Controller.
 readonly CHANNEL_BASED_BROKER_CONTROLLER="config/brokers/channel-broker"
@@ -179,11 +180,16 @@ function install_mt_broker() {
   ko apply --strict -f ${TMP_MT_CHANNEL_BASED_BROKER_CONFIG_DIR} || return 1
   wait_until_pods_running ${TEST_EVENTING_NAMESPACE} || return 1
   wait_until_pods_running ${TEST_EVENTING_NAMESPACE} || fail_test "Knative Eventing with MT Broker did not come up"
+}
 
-  # Install Sugar Controller
-  ko apply --strict -f ${SUGAR_CONTROLLER_CONFIG_DIR} || return 1
-  kubectl -n ${KNATIVE_DEFAULT_NAMESPACE} set env deployment/sugar-controller BROKER_INJECTION_DEFAULT=true || return 1
-  wait_until_pods_running ${KNATIVE_DEFAULT_NAMESPACE} || return 1
+function install_sugar() {
+  local TMP_SUGAR_CONTROLLER_CONFIG_DIR=${TMP_DIR}/${SUGAR_CONTROLLER_CONFIG_DIR}
+  mkdir -p ${TMP_SUGAR_CONTROLLER_CONFIG_DIR}
+  cp -r ${SUGAR_CONTROLLER_CONFIG_DIR}/* ${TMP_SUGAR_CONTROLLER_CONFIG_DIR}
+  find ${TMP_SUGAR_CONTROLLER_CONFIG_DIR} -type f -name "*.yaml" -exec sed -i "s/namespace: ${KNATIVE_DEFAULT_NAMESPACE}/namespace: ${TEST_EVENTING_NAMESPACE}/g" {} +
+  ko apply --strict -f ${TMP_SUGAR_CONTROLLER_CONFIG_DIR} || return 1
+  kubectl -n ${TEST_EVENTING_NAMESPACE} set env deployment/sugar-controller BROKER_INJECTION_DEFAULT=true || return 1
+  wait_until_pods_running ${TEST_EVENTING_NAMESPACE} || fail_test "Knative Eventing Sugar Controller did not come up"
 }
 
 # Teardown the Knative environment after tests finish.

test/e2e-tests.sh

@@ -34,6 +34,8 @@ initialize $@ --skip-istio-addon
 
 install_mt_broker || fail_test "Could not install MT Channel Based Broker"
 
+install_sugar || fail_test "Could not install Sugar Controller"
+
 echo "Running tests with Multi Tenant Channel Based Broker"
 go_test_e2e -timeout=30m -parallel=12 ./test/e2e ./test/conformance -brokerclass=MTChannelBasedBroker -channels=messaging.knative.dev/v1beta1:Channel,messaging.knative.dev/v1beta1:InMemoryChannel,messaging.knative.dev/v1:Channel,messaging.knative.dev/v1:InMemoryChannel -sources=sources.knative.dev/v1alpha2:ApiServerSource,sources.knative.dev/v1alpha2:ContainerSource,sources.knative.dev/v1alpha2:PingSource || fail_test
 

test/e2e-upgrade-tests.sh

@@ -62,6 +62,7 @@ run_preinstall_V016 || fail_test 'Running preinstall 0.16 failed'
 install_head || fail_test 'Installing HEAD version of eventing failed'
 install_channel_crds || fail_test 'Installing HEAD channel CRDs failed'
 install_mt_broker || fail_test 'Installing HEAD Broker failed'
+install_sugar || fail_test 'Installing HEAD Sugar failed'
 
 header "Running postupgrade tests"
 go_test_e2e -tags=postupgrade -timeout="${TIMEOUT}" ./test/upgrade || fail_test