From 7ff3afa61a0ab8d4d311d612c5ae3e557dec5b31 Mon Sep 17 00:00:00 2001 From: Sudesh Jethoe Date: Fri, 10 Mar 2023 22:38:38 +0100 Subject: [PATCH 1/2] add labels from eventbus crd to eventbus statefulset for jetstream Signed-off-by: Sudesh Jethoe --- controllers/eventbus/installer/jetstream.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/controllers/eventbus/installer/jetstream.go b/controllers/eventbus/installer/jetstream.go index b9ead295d6..3849afd8ae 100644 --- a/controllers/eventbus/installer/jetstream.go +++ b/controllers/eventbus/installer/jetstream.go @@ -196,7 +196,7 @@ func (r *jetStreamInstaller) createStatefulSet(ctx context.Context) error { ObjectMeta: metav1.ObjectMeta{ Namespace: r.eventBus.Namespace, Name: generateJetStreamStatefulSetName(r.eventBus), - Labels: r.labels, + Labels: r.mergeEventBusLabels(r.labels), Annotations: map[string]string{ common.AnnotationResourceSpecHash: hash, }, @@ -752,6 +752,19 @@ func generateJetStreamServerSecretName(eventBus *v1alpha1.EventBus) string { return fmt.Sprintf("eventbus-%s-js-server", eventBus.Name) } +func (r *jetStreamInstaller) mergeEventBusLabels(given map[string]string) map[string]string { + result := map[string]string{} + if r.eventBus.Labels != nil { + for k, v := range r.eventBus.Labels { + result[k] = v + } + } + for k, v := range given { + result[k] = v + } + return result +} + func generateJetStreamClientAuthSecretName(eventBus *v1alpha1.EventBus) string { return fmt.Sprintf("eventbus-%s-js-client-auth", eventBus.Name) } From 0ea9039290d14070888030d0d47ac6fa435aaa1c Mon Sep 17 00:00:00 2001 From: Sudesh Jethoe Date: Fri, 10 Mar 2023 22:38:52 +0100 Subject: [PATCH 2/2] update users Signed-off-by: Sudesh Jethoe --- USERS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/USERS.md b/USERS.md index bd0a937960..abc622978a 100644 --- a/USERS.md +++ b/USERS.md @@ -27,6 +27,7 @@ Organizations below are **officially** using Argo Events. Please send a PR with 1. [iFood](https://www.ifood.com.br) 1. [InsideBoard](https://www.insideboard.com) 1. [Intuit](https://www.intuit.com/) +1. [FikaWorks](https://fika.works/) 1. [Loam](https://www.getloam.com/) 1. [Mobimeo GmbH](https://mobimeo.com/en/home/) 1. [OneCause](https://www.onecause.com/)