From 62ce0352609da9005514b59cb6f5e39db57d60af Mon Sep 17 00:00:00 2001 From: ilia-medvedev-codefresh Date: Mon, 19 Jun 2023 13:07:50 +0300 Subject: [PATCH] fix eventbusname (#58) * fix eventbusname --- charts/gitops-runtime/Chart.yaml | 4 +++- charts/gitops-runtime/README.md | 4 ++-- .../event-reporters/events-reporter/_event-source.yaml | 2 +- .../_components/event-reporters/events-reporter/_sensor.yaml | 2 +- .../event-reporters/rollout-reporter/_event-source.yaml | 2 +- .../_components/event-reporters/rollout-reporter/_sensor.yaml | 2 +- .../event-reporters/workflow-reporter/_event-source.yaml | 2 +- .../event-reporters/workflow-reporter/_sensor.yaml | 2 +- 8 files changed, 11 insertions(+), 9 deletions(-) diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml index 76a17041..9de9685a 100644 --- a/charts/gitops-runtime/Chart.yaml +++ b/charts/gitops-runtime/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 0.1.30 description: A Helm chart for Codefresh gitops runtime name: gitops-runtime -version: 0.2.13-alpha +version: 0.2.13-alpha.1 home: https://github.com/codefresh-io/gitops-runtime-helm icon: https://avatars1.githubusercontent.com/u/11412079?v=3 keywords: @@ -19,6 +19,8 @@ annotations: description: csv generation for private registry utility - kind: added description: pdb for eventbus + - kind: fixed + description: fix eventbusname dependencies: - name: argo-cd repository: https://codefresh-io.github.io/argo-helm diff --git a/charts/gitops-runtime/README.md b/charts/gitops-runtime/README.md index 0cc87300..4e41fd14 100644 --- a/charts/gitops-runtime/README.md +++ b/charts/gitops-runtime/README.md @@ -1,5 +1,5 @@ ## Codefresh gitops runtime -![Version: 0.2.13-alpha](https://img.shields.io/badge/Version-0.2.13--alpha-informational?style=flat-square) ![AppVersion: 0.1.30](https://img.shields.io/badge/AppVersion-0.1.30-informational?style=flat-square) +![Version: 0.2.13-alpha.1](https://img.shields.io/badge/Version-0.2.13--alpha.1-informational?style=flat-square) ![AppVersion: 0.1.30](https://img.shields.io/badge/AppVersion-0.1.30-informational?style=flat-square) ## Codefresh official documentation: Prior to running the installation please see the official documentation at: https://codefresh.io/docs/docs/installation/gitops/hybrid-gitops-helm-installation/ @@ -15,7 +15,7 @@ We have created a helper utility to resolve this issue: The utility is packaged in a container image. Below are instructions on executing the utility using Docker: ``` -docker run -v :/output quay.io/codefresh/gitops-runtime-private-registry-utils:0.2.13-alpha +docker run -v :/output quay.io/codefresh/gitops-runtime-private-registry-utils:0.2.13-alpha.1 ``` `output_dir` - is a local directory where the utility will output files.
`local_registry` - is your local registry where you want to mirror the images to diff --git a/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_event-source.yaml b/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_event-source.yaml index e25d3ab2..f3dbad55 100644 --- a/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_event-source.yaml +++ b/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_event-source.yaml @@ -7,7 +7,7 @@ metadata: name: events-reporter spec: replicas: {{ .Values.events.eventSource.replicas }} - eventBusName: {{ .Values.global.runtime.eventBusName }} + eventBusName: {{ default "codefresh-eventbus" .Values.global.runtime.eventBus.name }} generic: events: authSecret: diff --git a/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_sensor.yaml b/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_sensor.yaml index 1683f68e..25cd0d9d 100644 --- a/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_sensor.yaml +++ b/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_sensor.yaml @@ -11,7 +11,7 @@ spec: - name: events eventSourceName: events-reporter eventName: events - eventBusName: {{ .Values.global.runtime.eventBusName }} + eventBusName: {{ default "codefresh-eventbus" .Values.global.runtime.eventBus.name }} template: serviceAccountName: {{ include "event-reporters.events-reporter.serviceAccountName" .}} container: diff --git a/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_event-source.yaml b/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_event-source.yaml index ced9501e..054cc2b3 100644 --- a/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_event-source.yaml +++ b/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: {{ .Values.global.runtime.eventBusName }} + eventBusName: {{ default "codefresh-eventbus" .Values.global.runtime.eventBus.name }} resource: analysisruns: eventTypes: diff --git a/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_sensor.yaml b/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_sensor.yaml index cfe6dab1..7ce035ef 100644 --- a/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_sensor.yaml +++ b/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_sensor.yaml @@ -17,7 +17,7 @@ spec: - name: analysisruns eventSourceName: rollout-reporter eventName: analysisruns - eventBusName: {{ .Values.global.runtime.eventBusName }} + eventBusName: {{ default "codefresh-eventbus" .Values.global.runtime.eventBus.name }} template: serviceAccountName: {{ include "event-reporters.rollout-reporter.serviceAccountName" .}} container: diff --git a/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_event-source.yaml b/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_event-source.yaml index e026f304..5844d42e 100644 --- a/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_event-source.yaml +++ b/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: {{ .Values.global.runtime.eventBusName }} + eventBusName: {{ default "codefresh-eventbus" .Values.global.runtime.eventBus.name }} resource: workflows: eventTypes: diff --git a/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_sensor.yaml b/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_sensor.yaml index 2c54b71c..9ec977ff 100644 --- a/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_sensor.yaml +++ b/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_sensor.yaml @@ -11,7 +11,7 @@ spec: - eventName: workflows eventSourceName: workflow-reporter name: workflows - eventBusName: {{ .Values.global.runtime.eventBusName }} + eventBusName: {{ default "codefresh-eventbus" .Values.global.runtime.eventBus.name }} template: serviceAccountName: {{ include "event-reporters.workflow-reporter.serviceAccountName" .}} container: