fixed eventbus name across sensors and eventsources

Author: ATGardner

charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_event-source.yaml

@@ -7,7 +7,7 @@ metadata:
     {{- include "event-reporters.rollout-reporter.labels" . | nindent 4}}
 spec:
   replicas: {{ .Values.rollout.eventSource.replicas }}
-  eventBusName: {{ default "codefresh-eventbus" .Values.global.runtime.eventBus.name }}
+  eventBusName: {{ include "codefresh-gitops-runtime.eventbus.name" .Values.global.runtime.eventBus }}
   resource:
     analysisruns:
       eventTypes:

charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_sensor.yaml

@@ -17,7 +17,7 @@ spec:
   - name: analysisruns
     eventSourceName: rollout-reporter
     eventName: analysisruns
-  eventBusName: {{ default "codefresh-eventbus" .Values.global.runtime.eventBus.name }}
+  eventBusName: {{ include "codefresh-gitops-runtime.eventbus.name" .Values.global.runtime.eventBus }}
   template:
     serviceAccountName: {{ include "event-reporters.rollout-reporter.serviceAccountName" .}}
     container:

charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_event-source.yaml

@@ -7,7 +7,7 @@ metadata:
     {{- include "event-reporters.workflow-reporter.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.workflow.eventSource.replicas }}
-  eventBusName: {{ default "codefresh-eventbus" .Values.global.runtime.eventBus.name }}
+  eventBusName: {{ include "codefresh-gitops-runtime.eventbus.name" .Values.global.runtime.eventBus }}
   resource:
     workflows:
       eventTypes:

charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_sensor.yaml

@@ -11,7 +11,7 @@ spec:
     - eventName: workflows
       eventSourceName: workflow-reporter
       name: workflows
-  eventBusName: {{ default "codefresh-eventbus" .Values.global.runtime.eventBus.name }}
+  eventBusName: {{ include "codefresh-gitops-runtime.eventbus.name" .Values.global.runtime.eventBus }}
   template:
     serviceAccountName: {{ include "event-reporters.workflow-reporter.serviceAccountName" .}}
     container:

charts/gitops-runtime/templates/_helpers.tpl

@@ -507,3 +507,17 @@ valueFrom:
     optional: true
 {{- end }}
 # ------------------------------------------------------------------------------------------------------------
+
+{{- define "codefresh-gitops-runtime.eventbus.name" }}
+  {{- $eventBusName := "" }}
+  {{- $eventBusType := .type }}
+  {{- if eq $eventBusType "nats" }}
+    {{- $eventBusName = default "codefresh-eventbus" .name }}
+  {{- else if eq $eventBusType "jetstream" }}
+    {{- $eventBusName = default "codefresh-eventbus-jetstream" .name }}
+  {{- else }}
+    {{- fail (printf "ERROR: EventBus type %s is inavlid, must be nats|jetstream" $eventBusType ) }}
+  {{- end }}
+
+{{- printf "%s" $eventBusName }}
+{{- end }}

charts/gitops-runtime/templates/eventbus/codefresh-eventbus.yaml

@@ -1,4 +1,4 @@
-{{- $eventBusName := .Values.global.runtime.eventBus.name }}
+{{- $eventBusName := (include "codefresh-gitops-runtime.eventbus.name" .Values.global.runtime.eventBus) }}
 {{- $eventBusSpec := .Values.global.runtime.eventBus }}
 {{- $eventBusType := .Values.global.runtime.eventBus.type }}
 {{/* Remove name from eventbus spec */}}
@@ -16,14 +16,12 @@
 
 {{- if eq $eventBusType "nats" }}
   {{- $eventBusSpec = unset $eventBusSpec "jetstream" }}
-  {{- $eventBusName = default "codefresh-eventbus" $eventBusName }}
   {{- $_ := set $eventBusSpec.nats.native "nodeSelector" ($eventBusSpec.nats.native.nodeSelector | default .Values.global.nodeSelector) }}
   {{- $_ := set $eventBusSpec.nats.native "tolerations" ($eventBusSpec.nats.native.tolerations | default .Values.global.tolerations) }}
 {{- end }}
 
 {{- if eq $eventBusType "jetstream" }}
   {{- $eventBusSpec = unset $eventBusSpec "nats" }}
-  {{- $eventBusName = default "codefresh-eventbus-jetstream" $eventBusName }}
   {{- $_ := set $eventBusSpec.jetstream "nodeSelector" ($eventBusSpec.jetstream.nodeSelector | default .Values.global.nodeSelector) }}
   {{- $_ := set $eventBusSpec.jetstream "tolerations" ($eventBusSpec.jetstream.tolerations | default .Values.global.tolerations) }}
 {{- end }}

charts/gitops-runtime/templates/eventbus/pdb.yaml

@@ -1,4 +1,4 @@
-{{- $eventBusName := default "codefresh-eventbus" .Values.global.runtime.eventBus.name }}
+{{- $eventBusName := (include "codefresh-gitops-runtime.eventbus.name" .Values.global.runtime.eventBus) }}
 {{- if .Values.global.runtime.eventBus.pdb.enabled }}
 apiVersion: policy/v1
 kind: PodDisruptionBudget

tests/component-tests/setup/codefresh-isc

@@ -0,0 +1 @@
+Subproject commit 36db6073a3c784095872b5243aeb1cbb31f85765

tests/component-tests/setup/simple-app

@@ -0,0 +1 @@
+Subproject commit 725c7353bd7859036d547c97b948734c91d30d61