[release-v1.11] Apply cm copy over 1.11 (#911)

* Add patch to copy openshift-trusted-cabundle CM to namespaced broker namespace (#910) * Apply patch Signed-off-by: Matthias Wessendorf <[email protected]> --------- Signed-off-by: Matthias Wessendorf <[email protected]> Co-authored-by: Christoph Stäbler <[email protected]>
openshift-knative · Dec 8, 2023 · d68e9bf · d68e9bf
1 parent 8feed0c
commit d68e9bf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git 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
@@ -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 {