diff --git a/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_rbac.yaml b/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_rbac.yaml index bb7966f7..d2eaa880 100644 --- a/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_rbac.yaml +++ b/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_rbac.yaml @@ -19,7 +19,7 @@ kind: RoleBinding metadata: name: rollout-reporter-sa labels: - app.kubernetes.io/part-of: workflow-reporter + app.kubernetes.io/part-of: rollout-reporter codefresh.io/internal: "true" roleRef: apiGroup: "" @@ -28,4 +28,4 @@ roleRef: subjects: - kind: ServiceAccount name: {{ include "event-reporters.rollout-reporter.serviceAccountName" . }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/gitops-runtime/templates/_helpers.tpl b/charts/gitops-runtime/templates/_helpers.tpl index 2782b776..bc2af520 100644 --- a/charts/gitops-runtime/templates/_helpers.tpl +++ b/charts/gitops-runtime/templates/_helpers.tpl @@ -150,7 +150,11 @@ Determine rollouts name */}} {{- define "codefresh-gitops-runtime.argo-rollouts.name" -}} {{/* For now use template from rollouts chart until better approach */}} -{{- template "argo-rollouts.fullname" (dict "Values" (get .Values "argo-rollouts")) }} +{{- if and (index .Values "argo-rollouts" "enabled") }} + {{- template "argo-rollouts.fullname" (dict "Values" (get .Values "argo-rollouts")) }} +{{- else }} + {{- printf "%s" (index .Values "event-reporters" "rollout" "external-argo-rollouts" "fullnameOverride") }} +{{- end }} {{- end }} diff --git a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/clusterrolebinding.yaml b/charts/gitops-runtime/templates/event-reporters/rollout-reporter/clusterrolebinding.yaml index 07de6d6c..1d0de37f 100644 --- a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/clusterrolebinding.yaml +++ b/charts/gitops-runtime/templates/event-reporters/rollout-reporter/clusterrolebinding.yaml @@ -1,8 +1,8 @@ {{/* Mapping of argo rollouts clusterrole if such is created (see https://github.com/codefresh-io/argo-helm/blob/argo-rollouts/charts/argo-rollouts/templates/controller/clusterrolebinding.yaml) to the reporters ServiceAccount */}} -{{- if index (get .Values "argo-rollouts") "enabled" }} - {{- if and (index (get .Values "argo-rollouts") "clusterInstall") (index (get .Values "argo-rollouts") "controller" "createClusterRole") }} +{{- if or (index (get .Values "argo-rollouts") "enabled") (index .Values "event-reporters" "rollout" "external-argo-rollouts" "enabled") }} + {{- if or (and (index (get .Values "argo-rollouts") "clusterInstall") (index (get .Values "argo-rollouts") "controller" "createClusterRole")) (index .Values "event-reporters" "rollout" "external-argo-rollouts" "enabled") }} {{- $eventReporterContext := deepCopy . }} {{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }} {{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }} diff --git a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/eventsource.yaml b/charts/gitops-runtime/templates/event-reporters/rollout-reporter/eventsource.yaml index f7dd3eac..be9b6ecd 100644 --- a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/eventsource.yaml +++ b/charts/gitops-runtime/templates/event-reporters/rollout-reporter/eventsource.yaml @@ -1,4 +1,4 @@ -{{- if index (get .Values "argo-rollouts") "enabled" }} +{{- if or (index (get .Values "argo-rollouts") "enabled") (index .Values "event-reporters" "rollout" "external-argo-rollouts" "enabled") }} {{- $eventReporterContext := deepCopy . }} {{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }} {{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }} diff --git a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/rbac.yaml b/charts/gitops-runtime/templates/event-reporters/rollout-reporter/rbac.yaml index fd621f7d..2153ff5b 100644 --- a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/rbac.yaml +++ b/charts/gitops-runtime/templates/event-reporters/rollout-reporter/rbac.yaml @@ -1,4 +1,4 @@ -{{- if index (get .Values "argo-rollouts") "enabled" }} +{{- if or (index (get .Values "argo-rollouts") "enabled") (index .Values "event-reporters" "rollout" "external-argo-rollouts" "enabled") }} {{- $eventReporterContext := deepCopy . }} {{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }} {{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }} diff --git a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/sensor.yaml b/charts/gitops-runtime/templates/event-reporters/rollout-reporter/sensor.yaml index a55eb3bb..cf67ccdb 100644 --- a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/sensor.yaml +++ b/charts/gitops-runtime/templates/event-reporters/rollout-reporter/sensor.yaml @@ -1,4 +1,4 @@ -{{- if index (get .Values "argo-rollouts") "enabled" }} +{{- if or (index (get .Values "argo-rollouts") "enabled") (index .Values "event-reporters" "rollout" "external-argo-rollouts" "enabled") }} {{- $eventReporterContext := deepCopy . }} {{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }} {{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }} diff --git a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/serviceaccount.yaml b/charts/gitops-runtime/templates/event-reporters/rollout-reporter/serviceaccount.yaml index aaf424e6..64880e80 100644 --- a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/serviceaccount.yaml +++ b/charts/gitops-runtime/templates/event-reporters/rollout-reporter/serviceaccount.yaml @@ -1,4 +1,4 @@ -{{- if index (get .Values "argo-rollouts") "enabled" }} +{{- if or (index (get .Values "argo-rollouts") "enabled") (index .Values "event-reporters" "rollout" "external-argo-rollouts" "enabled") }} {{- $eventReporterContext := deepCopy . }} {{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }} {{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }} diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index c70d8b02..9870594d 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -288,6 +288,9 @@ argo-rollouts: #----------------------------------------------------------------------------------------------------------------------- event-reporters: rollout: + external-argo-rollouts: + enabled: false + fullnameOverride: argo-rollouts serviceAccount: create: true eventSource: