[SRVKE-1192] Remove sugar-controller

hack/generate/csv.sh

@@ -111,7 +111,6 @@ image "net-istio-controller__controller" "${KNATIVE_ISTIO_CONTROLLER}"
 image "net-istio-webhook__webhook" "${KNATIVE_ISTIO_WEBHOOK}"
 
 image "eventing-controller__eventing-controller"                                                   "${KNATIVE_EVENTING_CONTROLLER}"
-image "sugar-controller__controller"                                                               "${KNATIVE_EVENTING_SUGAR_CONTROLLER}"
 image "eventing-webhook__eventing-webhook"                                                         "${KNATIVE_EVENTING_WEBHOOK}"
 image "storage-version-migration-eventing-eventing-$(metadata.get dependencies.eventing)__migrate" "${KNATIVE_EVENTING_STORAGE_VERSION_MIGRATION}"
 image "mt-broker-controller__mt-broker-controller"                                                 "${KNATIVE_EVENTING_MTCHANNEL_BROKER}"

olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml

@@ -458,8 +458,6 @@ spec:
                         value: "registry.ci.openshift.org/openshift/knative-v1.4.0:net-istio-webhook"
                       - name: "IMAGE_eventing-controller__eventing-controller"
                         value: "registry.ci.openshift.org/openshift/knative-v1.3.2:knative-eventing-controller"
-                      - name: "IMAGE_sugar-controller__controller"
-                        value: "registry.ci.openshift.org/openshift/knative-v1.3.2:knative-eventing-sugar-controller"
                       - name: "IMAGE_eventing-webhook__eventing-webhook"
                         value: "registry.ci.openshift.org/openshift/knative-v1.3.2:knative-eventing-webhook"
                       - name: "IMAGE_storage-version-migration-eventing-eventing-1.3.2__migrate"
@@ -603,8 +601,6 @@ spec:
                         value: "registry.ci.openshift.org/openshift/knative-v1.4.0:net-istio-webhook"
                       - name: "IMAGE_eventing-controller__eventing-controller"
                         value: "registry.ci.openshift.org/openshift/knative-v1.3.2:knative-eventing-controller"
-                      - name: "IMAGE_sugar-controller__controller"
-                        value: "registry.ci.openshift.org/openshift/knative-v1.3.2:knative-eventing-sugar-controller"
                       - name: "IMAGE_eventing-webhook__eventing-webhook"
                         value: "registry.ci.openshift.org/openshift/knative-v1.3.2:knative-eventing-webhook"
                       - name: "IMAGE_storage-version-migration-eventing-eventing-1.3.2__migrate"
@@ -842,8 +838,6 @@ spec:
       image: "registry.ci.openshift.org/openshift/knative-v1.4.0:net-istio-webhook"
     - name: "IMAGE_eventing-controller__eventing-controller"
       image: "registry.ci.openshift.org/openshift/knative-v1.3.2:knative-eventing-controller"
-    - name: "IMAGE_sugar-controller__controller"
-      image: "registry.ci.openshift.org/openshift/knative-v1.3.2:knative-eventing-sugar-controller"
     - name: "IMAGE_eventing-webhook__eventing-webhook"
       image: "registry.ci.openshift.org/openshift/knative-v1.3.2:knative-eventing-webhook"
     - name: "IMAGE_storage-version-migration-eventing-eventing-1.3.2__migrate"

openshift-knative-operator/hack/update-manifests.sh

@@ -11,7 +11,7 @@ source "$root/hack/lib/__sources__.bash"
 # These files could in theory change from release to release, though their names should
 # be fairly stable.
 serving_files=(serving-crds serving-core serving-hpa serving-post-install-jobs)
-eventing_files=(eventing-crds.yaml eventing-core.yaml in-memory-channel.yaml mt-channel-broker.yaml eventing-sugar-controller.yaml eventing-post-install.yaml)
+eventing_files=(eventing-crds.yaml eventing-core.yaml in-memory-channel.yaml mt-channel-broker.yaml eventing-post-install.yaml)
 
 # This excludes the gateways and peerauthentication settings as we want customers to do
 # manipulate those.

openshift-knative-operator/pkg/monitoring/helpers.go

@@ -242,8 +242,6 @@ func getDefaultMetricsPort(name string) string {
 func getSelectorLabels(component string) map[string]string {
 	labels := map[string]string{}
 	switch component {
-	case "sugar-controller":
-		labels["eventing.knative.dev/role"] = component
 	case "imc-controller":
 		labels["messaging.knative.dev/channel"] = "in-memory-channel"
 		labels["messaging.knative.dev/role"] = "controller"

test/e2e/knative_eventing_test.go

@@ -21,7 +21,6 @@ var knativeEventingControlPlaneDeploymentNames = []string{
 	"mt-broker-controller",
 	"mt-broker-filter",
 	"mt-broker-ingress",
-	"sugar-controller",
 }
 
 func TestKnativeEventing(t *testing.T) {
@@ -37,7 +36,7 @@ func TestKnativeEventing(t *testing.T) {
 
 	t.Run("verify correct deployment shape", func(t *testing.T) {
 		// Check the desired scale of deployments in the knative eventing namespace
-		for _, deployment := range []string{"eventing-controller", "eventing-webhook", "imc-controller", "imc-dispatcher", "mt-broker-controller", "sugar-controller"} {
+		for _, deployment := range []string{"eventing-controller", "eventing-webhook", "imc-controller", "imc-dispatcher", "mt-broker-controller"} {
 			if err := test.CheckDeploymentScale(caCtx, eventingNamespace, deployment, eventingHaReplicas); err != nil {
 				t.Fatalf("Failed to verify default HA settings for %q: %v", deployment, err)
 			}