From c642cea3462318b1ebcb7815b9d473cd6c62b992 Mon Sep 17 00:00:00 2001 From: Ville Aikas Date: Wed, 8 Jul 2020 17:07:42 -0700 Subject: [PATCH] remove the channel-broker configs and release files --- .../channel-broker/500-controller.yaml | 1 - .../deployments/controller.yaml | 75 ------------------- .../channel-broker/deployments/dummy.go | 16 ---- hack/release.sh | 8 +- 4 files changed, 2 insertions(+), 98 deletions(-) delete mode 120000 config/brokers/channel-broker/500-controller.yaml delete mode 100644 config/brokers/channel-broker/deployments/controller.yaml delete mode 100644 config/brokers/channel-broker/deployments/dummy.go diff --git a/config/brokers/channel-broker/500-controller.yaml b/config/brokers/channel-broker/500-controller.yaml deleted file mode 120000 index 7a5f7f74af1..00000000000 --- a/config/brokers/channel-broker/500-controller.yaml +++ /dev/null @@ -1 +0,0 @@ -deployments/controller.yaml \ No newline at end of file diff --git a/config/brokers/channel-broker/deployments/controller.yaml b/config/brokers/channel-broker/deployments/controller.yaml deleted file mode 100644 index 75649b23c17..00000000000 --- a/config/brokers/channel-broker/deployments/controller.yaml +++ /dev/null @@ -1,75 +0,0 @@ -# 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 - knative.dev/high-availability: "true" -spec: - replicas: 0 - selector: - matchLabels: - app: broker-controller - template: - metadata: - labels: - app: broker-controller - eventing.knative.dev/release: devel - spec: - serviceAccountName: eventing-controller - containers: - - name: broker-controller - terminationMessagePolicy: FallbackToLogsOnError - image: gcr.io/knative-releases/knative.dev/eventing/cmd/channel_broker@sha256:7d3ae9a7139a846490869e58d9f4ddbe31b8a60df306c3636962609fbcca523d - - 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: gcr.io/knative-releases/knative.dev/eventing/cmd/broker/ingress@sha256:a7a9dba94024ba961604f08be1bc49eddb40941dee4f291ed609149d899e7afa - - name: BROKER_INGRESS_SERVICE_ACCOUNT - value: eventing-broker-ingress - - name: BROKER_FILTER_IMAGE - value: gcr.io/knative-releases/knative.dev/eventing/cmd/broker/filter@sha256:fa50a25fd2db5ab09cc604d2b3d4ad36da3687882352c68ca11cb273e65111f7 - - 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 diff --git a/config/brokers/channel-broker/deployments/dummy.go b/config/brokers/channel-broker/deployments/dummy.go deleted file mode 100644 index 16869185609..00000000000 --- a/config/brokers/channel-broker/deployments/dummy.go +++ /dev/null @@ -1,16 +0,0 @@ -/* -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. -*/ - -// Package deployments is a placeholder that allows us to pull in config files -// via go mod vendor. -package deployments diff --git a/hack/release.sh b/hack/release.sh index a13bc3154a7..7f9a93ad4e7 100755 --- a/hack/release.sh +++ b/hack/release.sh @@ -21,7 +21,6 @@ source $(dirname $0)/../vendor/knative.dev/test-infra/scripts/release.sh readonly EVENTING_CORE_YAML="eventing-core.yaml" readonly EVENTING_CRDS_YAML="eventing-crds.yaml" -readonly CHANNEL_BROKER_YAML="deprecated-channel-broker.yaml" readonly SUGAR_CONTROLLER_YAML="eventing-sugar-controller.yaml" readonly MT_CHANNEL_BROKER_YAML="mt-channel-broker.yaml" readonly IN_MEMORY_CHANNEL="in-memory-channel.yaml" @@ -30,7 +29,7 @@ readonly POST_INSTALL_V_0_16="eventing-post-install-jobs.yaml" declare -A RELEASES RELEASES=( - ["eventing.yaml"]="${EVENTING_CORE_YAML} ${CHANNEL_BROKER_YAML} ${MT_CHANNEL_BROKER_YAML} ${IN_MEMORY_CHANNEL}" + ["eventing.yaml"]="${EVENTING_CORE_YAML} ${MT_CHANNEL_BROKER_YAML} ${IN_MEMORY_CHANNEL}" ) readonly RELEASES @@ -55,9 +54,6 @@ function build_release() { # Create sugar controller yaml ko resolve ${KO_FLAGS} -f config/sugar/ | "${LABEL_YAML_CMD[@]}" > "${SUGAR_CONTROLLER_YAML}" - # Create channel broker yaml - ko resolve ${KO_FLAGS} -f config/brokers/channel-broker/ | "${LABEL_YAML_CMD[@]}" > "${CHANNEL_BROKER_YAML}" - # Create mt channel broker yaml ko resolve ${KO_FLAGS} -f config/brokers/mt-channel-broker/ | "${LABEL_YAML_CMD[@]}" > "${MT_CHANNEL_BROKER_YAML}" @@ -70,7 +66,7 @@ function build_release() { # Create v0.16.0 post-install job yaml. Cleans up old broker resources from deleted namespaced brokers. ko resolve ${KO_FLAGS} -f config/post-install/v0.16.0/ | "${LABEL_YAML_CMD[@]}" > "${POST_INSTALL_V_0_16}" - local all_yamls=(${EVENTING_CORE_YAML} ${EVENTING_CRDS_YAML} ${SUGAR_CONTROLLER_YAML} ${CHANNEL_BROKER_YAML} ${MT_CHANNEL_BROKER_YAML} ${IN_MEMORY_CHANNEL} ${PRE_INSTALL_V_0_16} ${POST_INSTALL_V_0_16}) + local all_yamls=(${EVENTING_CORE_YAML} ${EVENTING_CRDS_YAML} ${SUGAR_CONTROLLER_YAML} ${MT_CHANNEL_BROKER_YAML} ${IN_MEMORY_CHANNEL} ${PRE_INSTALL_V_0_16} ${POST_INSTALL_V_0_16}) # Assemble the release for yaml in "${!RELEASES[@]}"; do