From d68e9bf1323e612b6a256723515cd9cc35c0b851 Mon Sep 17 00:00:00 2001 From: Matthias Wessendorf Date: Fri, 8 Dec 2023 05:32:30 +0100 Subject: [PATCH] [release-v1.11] Apply cm copy over 1.11 (#911) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add patch to copy openshift-trusted-cabundle CM to namespaced broker namespace (#910) * Apply patch Signed-off-by: Matthias Wessendorf --------- Signed-off-by: Matthias Wessendorf Co-authored-by: Christoph Stäbler --- .../pkg/reconciler/broker/namespaced_broker.go | 1 + .../namespaced_broker_copy_trustedca_cm.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 openshift/patches/namespaced_broker_copy_trustedca_cm.patch diff --git a/control-plane/pkg/reconciler/broker/namespaced_broker.go b/control-plane/pkg/reconciler/broker/namespaced_broker.go index 5e71fa6d07..4db94dede7 100644 --- a/control-plane/pkg/reconciler/broker/namespaced_broker.go +++ b/control-plane/pkg/reconciler/broker/namespaced_broker.go @@ -386,6 +386,7 @@ func (r *NamespacedReconciler) configMapsFromSystemNamespace(broker *eventing.Br "config-kafka-broker-data-plane", "config-tracing", "kafka-config-logging", + "config-openshift-trusted-cabundle", } resources := make([]unstructured.Unstructured, 0, len(configMaps)) for _, name := range configMaps { diff --git a/openshift/patches/namespaced_broker_copy_trustedca_cm.patch b/openshift/patches/namespaced_broker_copy_trustedca_cm.patch new file mode 100644 index 0000000000..c93b43d7b6 --- /dev/null +++ b/openshift/patches/namespaced_broker_copy_trustedca_cm.patch @@ -0,0 +1,12 @@ +diff --git a/control-plane/pkg/reconciler/broker/namespaced_broker.go b/control-plane/pkg/reconciler/broker/namespaced_broker.go +index 5e71fa6d0..4db94dede 100644 +--- a/control-plane/pkg/reconciler/broker/namespaced_broker.go ++++ b/control-plane/pkg/reconciler/broker/namespaced_broker.go +@@ -386,6 +386,7 @@ func (r *NamespacedReconciler) configMapsFromSystemNamespace(broker *eventing.Br + "config-kafka-broker-data-plane", + "config-tracing", + "kafka-config-logging", ++ "config-openshift-trusted-cabundle", + } + resources := make([]unstructured.Unstructured, 0, len(configMaps)) + for _, name := range configMaps {