Revert event reporter changes

charts/gitops-runtime/Chart.yaml

@@ -44,4 +44,4 @@ dependencies:
   condition: gitops-operator.enabled
 - name: cf-argocd-extras
   repository: oci://quay.io/codefresh/charts
-  version: 0.5.4
+  version: 0.5.5

charts/gitops-runtime/templates/_components/event-reporters/_helpers.tpl

@@ -0,0 +1,151 @@
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "event-reporters.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "event-reporters.rollout-reporter.name" -}}
+{{- print "rollout-reporter"}}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "event-reporters.rollout-reporter.fullname" -}}
+{{- print "rollout-reporter"}}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "event-reporters.rollout-reporter.labels" -}}
+helm.sh/chart: {{ include "event-reporters.chart" . }}
+{{ include "event-reporters.rollout-reporter.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: Helm
+codefresh.io/internal: "true"
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "event-reporters.rollout-reporter.selectorLabels" -}}
+app.kubernetes.io/part-of: rollout-reporter
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "event-reporters.rollout-reporter.serviceAccountName" -}}
+  {{- if .Values.rollout.serviceAccount.create }}
+    {{- default (include "event-reporters.rollout-reporter.fullname" .) .Values.rollout.serviceAccount.name }}
+  {{- else }}
+    {{- default "default" .Values.rollout.serviceAccount.name }}
+  {{- end }}
+{{- end }}
+
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "event-reporters.workflow-reporter.name" -}}
+{{- print "workflow-reporter"}}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "event-reporters.workflow-reporter.fullname" -}}
+{{- print "workflow-reporter"}}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "event-reporters.workflow-reporter.labels" -}}
+helm.sh/chart: {{ include "event-reporters.chart" . }}
+{{ include "event-reporters.workflow-reporter.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: Helm
+codefresh.io/internal: "true"
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "event-reporters.workflow-reporter.selectorLabels" -}}
+app.kubernetes.io/part-of: workflow-reporter
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "event-reporters.workflow-reporter.serviceAccountName" -}}
+  {{- if .Values.workflow.serviceAccount.create }}
+    {{- default "codefresh-sa" .Values.workflow.serviceAccount.name }}
+  {{- else }}
+    {{- default "default" .Values.workflow.serviceAccount.name }}
+  {{- end }}
+{{- end }}
+
+{{/*
+Create a single event-source sensor http trigger
+assumes the name, condition and payload.dependencyName are identical
+*/}}
+{{- define "event-reporters.http.trigger" -}}
+{{- $url := (printf "%s%s" .Values.global.codefresh.url .Values.global.codefresh.apiEventsPath | quote) -}}
+- template:
+    name: {{ .name }}
+    conditions: {{ .name }}
+    http:
+      method: POST
+      url: {{ $url }}
+  {{- if or .Values.global.codefresh.tls.caCerts.secret.create .Values.global.codefresh.tls.caCerts.secretKeyRef}}
+      tls:
+        caCertSecret:
+          name: {{ .Values.global.codefresh.tls.caCerts.secret.create | ternary "codefresh-tls-certs" .Values.global.codefresh.tls.caCerts.secretKeyRef.name }}
+          key: {{ .Values.global.codefresh.tls.caCerts.secret.create | ternary (default "ca-bundle.crt" .Values.global.codefresh.tls.caCerts.secret.key) .Values.global.codefresh.tls.caCerts.secretKeyRef.key }}
+  {{- end }}
+      headers:
+        Content-Type: application/json
+      secureHeaders:
+      - name: Authorization
+        valueFrom:
+          secretKeyRef:
+            key: token
+            name: codefresh-token
+      payload:
+      - dest: {{ .payloadDest }}
+        src:
+          dataKey: body
+          dependencyName: {{ .name }}
+  {{- if .retryStrategy }}
+  retryStrategy:
+  {{- .retryStrategy | toYaml | nindent 4 }}
+  {{- end }}
+{{- end -}}
+
+{{/* Logging trigger for the sensor - gets sensor.logging dict */}}
+{{- define "event-reporters.log.trigger" -}}
+  {{- if .enabled }}
+- template:
+    name: log-trigger
+    {{- if gt (int .intervalSeconds) 0 }}
+    log:
+      intervalSeconds: {{ .intervalSeconds }}
+    {{- else }}
+    log: {}
+    {{- end }}
+  {{- end }}
+{{- end }}

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

@@ -0,0 +1,62 @@
+{{- define "event-reporters.rollout-reporter.eventsource"}}
+apiVersion: argoproj.io/v1alpha1
+kind: EventSource
+metadata:
+  name: rollout-reporter
+  labels:
+    {{- include "event-reporters.rollout-reporter.labels" . | nindent 4}}
+spec:
+  replicas: {{ .Values.rollout.eventSource.replicas }}
+  eventBusName: {{ default "codefresh-eventbus" .Values.global.runtime.eventBus.name }}
+  resource:
+    analysisruns:
+      eventTypes:
+        - ADD
+        - UPDATE
+        - DELETE
+      filter:
+        createdBy: null
+      group: argoproj.io
+      resource: analysisruns
+      version: v1alpha1
+    replicasets:
+      eventTypes:
+        - ADD
+        - UPDATE
+        - DELETE
+      filter:
+        createdBy: null
+      group: apps
+      resource: replicasets
+      version: v1
+    rollouts:
+      eventTypes:
+        - ADD
+        - UPDATE
+        - DELETE
+      filter:
+        createdBy: null
+      group: argoproj.io
+      resource: rollouts
+      version: v1alpha1
+  template:
+    container:
+      name: ""
+      resources:
+      {{- with .Values.rollout.eventSource.resources  }}
+        {{- . | toYaml | nindent 8 }}
+      {{- end }}
+    serviceAccountName: {{ include "event-reporters.rollout-reporter.serviceAccountName" .}}
+    tolerations:
+    {{- with .Values.rollout.eventSource.tolerations | default .Values.global.tolerations }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
+    nodeSelector:
+    {{- with .Values.rollout.eventSource.nodeSelector | default .Values.global.nodeSelector }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
+    affinity:
+    {{- with .Values.affinity }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
+{{- end }}

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

@@ -0,0 +1,31 @@
+{{- define "event-reporters.rollout-reporter.rbac"}}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: rollout-reporter-sa
+  labels: 
+    app.kubernetes.io/part-of: rollout-reporter
+    codefresh.io/internal: "true"
+rules:
+  - apiGroups:
+      - "*"
+    resources:
+      - "*"
+    verbs:
+      - "*"
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: rollout-reporter-sa
+  labels:
+    app.kubernetes.io/part-of: workflow-reporter
+    codefresh.io/internal: "true"
+roleRef:
+  apiGroup: ""
+  kind: Role
+  name: rollout-reporter-sa
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "event-reporters.rollout-reporter.serviceAccountName" . }}
+{{- end }}

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

@@ -0,0 +1,47 @@
+{{- define "event-reporters.rollout-reporter.sensor"}}
+apiVersion: argoproj.io/v1alpha1
+kind: Sensor
+metadata:
+  name: rollout-reporter
+  labels:
+    {{- include "event-reporters.rollout-reporter.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.rollout.sensor.replicas }}
+  dependencies:
+  - name: rollouts
+    eventSourceName: rollout-reporter
+    eventName: rollouts
+  - name: replicasets
+    eventSourceName: rollout-reporter
+    eventName: replicasets
+  - name: analysisruns
+    eventSourceName: rollout-reporter
+    eventName: analysisruns
+  eventBusName: {{ default "codefresh-eventbus" .Values.global.runtime.eventBus.name }}
+  template:
+    serviceAccountName: {{ include "event-reporters.rollout-reporter.serviceAccountName" .}}
+    container:
+      name: ""
+      {{- include "codefresh-gitops-runtime.components.common_helpers.container-templates.env-vars" .Values.rollout.sensor.env  | nindent 6 }}
+      resources:
+      {{- with .Values.rollout.sensor.resources  }}
+        {{- . | toYaml | nindent 8 }}
+      {{- end }}
+    tolerations:
+    {{- with .Values.rollout.sensor.tolerations | default .Values.global.tolerations }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
+    nodeSelector:
+    {{- with .Values.rollout.sensor.nodeSelector | default .Values.global.nodeSelector}}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
+    affinity:
+    {{- with .Values.affinity }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
+  triggers:
+  {{- include "event-reporters.http.trigger" (dict "name" "rollouts" "Values" .Values "payloadDest" "data.object" "retryStrategy" .Values.rollout.sensor.retryStrategy) | nindent 4 }}
+  {{- include "event-reporters.http.trigger" (dict "name" "replicasets" "Values" .Values "payloadDest" "data.object" "retryStrategy" .Values.rollout.sensor.retryStrategy) | nindent 4 }}
+  {{- include "event-reporters.http.trigger" (dict "name" "analysisruns" "Values" .Values "payloadDest" "data.object" "retryStrategy" .Values.rollout.sensor.retryStrategy) | nindent 4 }}
+  {{- include "event-reporters.log.trigger" (.Values.rollout.sensor.logging) | nindent 4 }}
+{{- end }}

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

@@ -0,0 +1,10 @@
+{{- define "event-reporters.rollout-reporter.sa"}}
+  {{- if .Values.rollout.serviceAccount.create }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "event-reporters.rollout-reporter.serviceAccountName" .}}
+  labels:
+    {{- include "event-reporters.rollout-reporter.labels" . | nindent 4 }}
+  {{- end }}
+{{- end }}

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

@@ -0,0 +1,43 @@
+{{- define "event-reporters.workflow-reporter.eventsource"}}
+apiVersion: argoproj.io/v1alpha1
+kind: EventSource
+metadata:
+  name: workflow-reporter
+  labels:
+    {{- include "event-reporters.workflow-reporter.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.workflow.eventSource.replicas }}
+  eventBusName: {{ default "codefresh-eventbus" .Values.global.runtime.eventBus.name }}
+  resource:
+    workflows:
+      eventTypes:
+        - ADD
+        - UPDATE
+        - DELETE
+      filter:
+        createdBy: null
+      namespace: {{ .Release.Namespace }}
+      group: argoproj.io
+      resource: workflows
+      version: v1alpha1
+  template:
+    container:
+      name: ""
+      resources:
+      {{- with .Values.workflow.eventSource.resources  }}
+        {{- . | toYaml | nindent 8 }}
+      {{- end }}
+    serviceAccountName: {{ include "event-reporters.workflow-reporter.serviceAccountName" .}}
+    tolerations:
+    {{- with .Values.workflow.eventSource.tolerations | default .Values.global.tolerations }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    nodeSelector:
+    {{- with .Values.workflow.eventSource.nodeSelector | default .Values.global.nodeSelector }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    affinity:
+    {{- with .Values.affinity }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+{{- end }}

charts/gitops-runtime/templates/workflow-reporter-rbac.yaml → charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_rbac.yaml

@@ -1,7 +1,4 @@
-{{/*
-Workflow reporter RBAC for backward compatibility
-*/}}
-{{- if (index .Values "event-reporters" "workflow" "serviceAccount" "create") }}
+{{- define "event-reporters.workflow-reporter.rbac"}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
@@ -21,12 +18,13 @@ kind: RoleBinding
 metadata:
   name: workflow-reporter
   labels:
-    {{- include "event-reporters.workflow-reporter.labels" . | nindent 4 }}
+    app.kubernetes.io/part-of: workflow-reporter
+    codefresh.io/internal: "true"
 roleRef:
-  apiGroup: rbac.authorization.k8s.io
+  apiGroup: ""
   kind: Role
   name: workflow-reporter
 subjects:
   - kind: ServiceAccount
-    name: {{ include "event-reporters.workflow-reporter.serviceAccountName" . }}
-{{- end }} 
+    name: {{ include "event-reporters.workflow-reporter.serviceAccountName" .}}
+{{- end }}