diff --git a/hack/generate/csv.sh b/hack/generate/csv.sh index eb46dc2184..370aefba3b 100755 --- a/hack/generate/csv.sh +++ b/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}" diff --git a/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml b/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml index a7c4ace448..a11a5380ff 100644 --- a/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml +++ b/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" diff --git a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/1.3.2/6-eventing-post-install.yaml b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/1.3.2/5-eventing-post-install.yaml similarity index 100% rename from openshift-knative-operator/cmd/operator/kodata/knative-eventing/1.3.2/6-eventing-post-install.yaml rename to openshift-knative-operator/cmd/operator/kodata/knative-eventing/1.3.2/5-eventing-post-install.yaml diff --git a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/1.3.2/5-eventing-sugar-controller.yaml b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/1.3.2/5-eventing-sugar-controller.yaml deleted file mode 100644 index e18b194a2e..0000000000 --- a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/1.3.2/5-eventing-sugar-controller.yaml +++ /dev/null @@ -1,72 +0,0 @@ ---- -# Copyright 2019 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: sugar-controller - namespace: knative-eventing - labels: - eventing.knative.dev/release: v1.3.2 -spec: - selector: - matchLabels: &labels - eventing.knative.dev/role: sugar-controller - template: - metadata: - labels: *labels - spec: - affinity: - podAntiAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - podAffinityTerm: - labelSelector: - matchLabels: *labels - topologyKey: kubernetes.io/hostname - weight: 100 - serviceAccountName: eventing-controller - enableServiceLinks: false - containers: - - name: controller - image: TO_BE_REPLACED - env: - - name: CONFIG_LOGGING_NAME - value: config-logging - - name: CONFIG_OBSERVABILITY_NAME - value: config-observability - - name: METRICS_DOMAIN - value: knative.dev/sugar-controller - - name: SYSTEM_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - securityContext: - allowPrivilegeEscalation: false - readOnlyRootFilesystem: true - runAsNonRoot: true - capabilities: - drop: - - all - - ports: - - name: metrics - containerPort: 9090 - - name: profiling - containerPort: 8008 diff --git a/openshift-knative-operator/hack/update-manifests.sh b/openshift-knative-operator/hack/update-manifests.sh index 97546d8413..47ca0659cb 100755 --- a/openshift-knative-operator/hack/update-manifests.sh +++ b/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. diff --git a/openshift-knative-operator/pkg/monitoring/helpers.go b/openshift-knative-operator/pkg/monitoring/helpers.go index 476b338c19..995ac820cd 100644 --- a/openshift-knative-operator/pkg/monitoring/helpers.go +++ b/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" diff --git a/test/e2e/knative_eventing_test.go b/test/e2e/knative_eventing_test.go index ccdb3e5c77..524e83b3cf 100644 --- a/test/e2e/knative_eventing_test.go +++ b/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) }