diff --git a/charts/gitops-runtime/templates/_components/cf-argocd-extras/_default-values.tpl b/charts/gitops-runtime/templates/_components/cf-argocd-extras/_default-values.tpl index 37d145e2..61348f81 100644 --- a/charts/gitops-runtime/templates/_components/cf-argocd-extras/_default-values.tpl +++ b/charts/gitops-runtime/templates/_components/cf-argocd-extras/_default-values.tpl @@ -217,6 +217,294 @@ eventReporter: configMapKeyRef: name: event-reporter-cmd-params-cm key: threadiness + REPORTER_MODE: combined + + volumeMounts: + codefresh-tls-certs: + path: + - mountPath: /app/config/codefresh-tls-certs + readOnly: true + + probes: + liveness: + enabled: true + type: httpGet + httpGet: + path: /healthz?full=true + port: 8088 + spec: + initialDelaySeconds: 3 + periodSeconds: 30 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 3 + readiness: + enabled: true + type: httpGet + httpGet: + path: /healthz + port: 8088 + spec: + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 1 + successThreshold: 1 + failureThreshold: 3 + + configMaps: + cmd-params-cm: + enabled: true + data: + app.queue.size: '1000' + argocd.server: argo-cd-server:80 + max.app.retries: '5' + otlp.address: '' + repo.server: argo-cd-repo-server:8081 + sources.server: http://sources-server + threadiness: '100' + + volumes: + codefresh-tls-certs: + enabled: true + type: secret + nameOverride: codefresh-tls-certs + optional: true + + pdb: + enabled: true + minAvailable: "50%" + maxUnavailable: "" + + service: + main: + enabled: true + type: ClusterIP + ports: + metrics: + port: 8087 + protocol: HTTP + targetPort: 8087 + + serviceMonitor: + main: + enabled: false + endpoints: + - port: metrics + scheme: http + path: /metrics + interval: 30s + scrapeTimeout: 10s +resourceReporter: + fullnameOverride: resource-reporter + + podAnnotations: {} + + serviceAccount: + enabled: true + + rbac: + enabled: true + namespaced: false + rules: + - apiGroups: + - '*' + resources: + - '*' + verbs: + - '*' + - nonResourceURLs: + - '*' + verbs: + - '*' + + controller: + enabled: true + type: statefulset + replicas: 1 + revisionHistoryLimit: 5 + + container: + name: resource-reporter + image: + registry: quay.io/codefresh + repository: cf-argocd-extras + tag: main + pullPolicy: IfNotPresent + + # these do not seem to work + ports: + - name: metrics + containerPort: 8087 + protocol: TCP + - name: health + containerPort: 8088 + protocol: TCP + + resources: + requests: + memory: 128Mi + cpu: 100m + + env: + HTTP_PROXY: '{{ .Values.global.httpProxy }}' + HTTPS_PROXY: '{{ .Values.global.httpsProxy }}' + NO_PROXY: '{{ .Values.global.noProxy }}' + APP_QUEUE_SIZE: + valueFrom: + configMapKeyRef: + name: event-reporter-cmd-params-cm + key: app.queue.size + ARGOCD_APPLICATION_NAMESPACES: + valueFrom: + configMapKeyRef: + name: argocd-cmd-params-cm + key: application.namespaces + optional: true + ARGOCD_SERVER: + valueFrom: + configMapKeyRef: + name: event-reporter-cmd-params-cm + key: argocd.server + ARGOCD_SERVER_ROOTPATH: + valueFrom: + configMapKeyRef: + name: argocd-cmd-params-cm + key: server.rootpath + optional: true + ARGO_CD_TOKEN_SECRET_NAME: argocd-token + ARGO_CD_TOKEN_SECRET_KEY: token + BINARY_NAME: event-reporter + CODEFRESH_SSL_CERT_PATH: "" + CODEFRESH_TLS_INSECURE: + valueFrom: + configMapKeyRef: + name: argocd-cmd-params-cm + key: codefresh.tls.insecure + optional: true + CODEFRESH_TOKEN: + valueFrom: + secretKeyRef: + name: codefresh-token + key: token + CODEFRESH_URL: + valueFrom: + configMapKeyRef: + key: base-url + name: codefresh-cm + EVENT_REPORTER_REPLICAS: 1 + INSECURE: + valueFrom: + configMapKeyRef: + name: event-reporter-cmd-params-cm + key: insecure + optional: true + LISTEN_ADDRESS: + valueFrom: + configMapKeyRef: + name: event-reporter-cmd-params-cm + key: listen.address + optional: true + LOG_FORMAT: + valueFrom: + configMapKeyRef: + name: event-reporter-cmd-params-cm + key: log.format + optional: true + LOG_LEVEL: + valueFrom: + configMapKeyRef: + name: event-reporter-cmd-params-cm + key: log.level + optional: true + MAX_APP_RETRIES: + valueFrom: + configMapKeyRef: + name: event-reporter-cmd-params-cm + key: max.app.retries + METRICS_LISTEN_ADDRESS: + valueFrom: + configMapKeyRef: + name: event-reporter-cmd-params-cm + key: metrics.listen.address + optional: true + OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: + valueFrom: + configMapKeyRef: + name: event-reporter-cmd-params-cm + key: otlp.address + REDISDB: + valueFrom: + configMapKeyRef: + name: argocd-cmd-params-cm + key: redis.db + optional: true + REDIS_COMPRESSION: + valueFrom: + configMapKeyRef: + name: argocd-cmd-params-cm + key: redis.compression + optional: true + REDIS_PASSWORD: + valueFrom: + secretKeyRef: + name: argocd-redis + key: auth + REDIS_SERVER: + valueFrom: + configMapKeyRef: + name: argocd-cmd-params-cm + key: redis.server + REDIS_USERNAME: + valueFrom: + secretKeyRef: + name: argocd-redis + key: redis-username + optional: true + REPO_SERVER: + valueFrom: + configMapKeyRef: + name: event-reporter-cmd-params-cm + key: repo.server + REPO_SERVER_PLAINTEXT: + valueFrom: + configMapKeyRef: + name: event-reporter-cmd-params-cm + key: repo.server.plaintext + optional: true + REPO_SERVER_STRICT_TLS: + valueFrom: + configMapKeyRef: + name: event-reporter-cmd-params-cm + key: repo.server.strict.tls + optional: true + REPO_SERVER_TIMEOUT_SECONDS: + valueFrom: + configMapKeyRef: + name: event-reporter-cmd-params-cm + key: repo.server.timeout.seconds + optional: true + RUNTIME_VERSION: + valueFrom: + configMapKeyRef: + name: codefresh-cm + key: version + SHARDING_ALGORITHM: + valueFrom: + configMapKeyRef: + name: event-reporter-cmd-params-cm + key: sharding.algorithm + optional: true + SOURCES_SERVER: + valueFrom: + configMapKeyRef: + name: event-reporter-cmd-params-cm + key: sources.server + THREADINESS: + valueFrom: + configMapKeyRef: + name: event-reporter-cmd-params-cm + key: threadiness + REPORTER_MODE: resource volumeMounts: codefresh-tls-certs: diff --git a/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_configmap.yaml b/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_configmap.yaml index 2cbdc16f..7be5a9cb 100644 --- a/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_configmap.yaml +++ b/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_configmap.yaml @@ -5,7 +5,7 @@ {{- $defaultVals := include "cf-argocd-extras.default-values" . | fromYaml }} {{- $vals := mergeOverwrite $defaultVals (get .Values "cf-argocd-extras") }} -{{- $_ := set $context "Values" $vals.eventReporter }} +{{- $_ := set $context "Values" (get $vals .reporterComponentName) }} {{- $_ := set $context.Values "global" (deepCopy (get .Values "global")) }} {{- $_ := set (index $context.Values.configMaps "cmd-params-cm" "data") "argocd.server" (include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . ) }} diff --git a/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_pdb.yaml b/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_pdb.yaml index bc6004d0..db9b9ecc 100644 --- a/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_pdb.yaml +++ b/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_pdb.yaml @@ -5,7 +5,7 @@ {{- $defaultVals := include "cf-argocd-extras.default-values" . | fromYaml }} {{- $vals := mergeOverwrite $defaultVals (get .Values "cf-argocd-extras") }} -{{- $_ := set $context "Values" $vals.eventReporter }} +{{- $_ := set $context "Values" (get $vals .reporterComponentName) }} {{- $_ := set $context.Values "global" (deepCopy (get .Values "global")) }} {{/* Workaround to NOT change label selectors from previous runtime release when event-reporter was part of cf-argocd-extras Subchart */}} diff --git a/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_rbac.yaml b/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_rbac.yaml index 64cd6d27..1bf7a390 100644 --- a/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_rbac.yaml +++ b/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_rbac.yaml @@ -5,7 +5,7 @@ {{- $defaultVals := include "cf-argocd-extras.default-values" . | fromYaml }} {{- $vals := mergeOverwrite $defaultVals (get .Values "cf-argocd-extras") }} -{{- $_ := set $context "Values" $vals.eventReporter }} +{{- $_ := set $context "Values" (get $vals .reporterComponentName) }} {{- $_ := set $context.Values "global" (deepCopy (get .Values "global")) }} {{/* Workaround to NOT change label selectors from previous runtime release when event-reporter was part of cf-argocd-extras Subchart */}} diff --git a/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_service.yaml b/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_service.yaml index a800535e..87562277 100644 --- a/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_service.yaml +++ b/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_service.yaml @@ -5,7 +5,7 @@ {{- $defaultVals := include "cf-argocd-extras.default-values" . | fromYaml }} {{- $vals := mergeOverwrite $defaultVals (get .Values "cf-argocd-extras") }} -{{- $_ := set $context "Values" $vals.eventReporter }} +{{- $_ := set $context "Values" (get $vals .reporterComponentName) }} {{- $_ := set $context.Values "global" (deepCopy (get .Values "global")) }} {{/* Workaround to NOT change label selectors from previous runtime release when event-reporter was part of cf-argocd-extras Subchart */}} diff --git a/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_serviceMonitor.yaml b/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_serviceMonitor.yaml index 015929d9..3da52cf7 100644 --- a/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_serviceMonitor.yaml +++ b/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_serviceMonitor.yaml @@ -5,7 +5,7 @@ {{- $defaultVals := include "cf-argocd-extras.default-values" . | fromYaml }} {{- $vals := mergeOverwrite $defaultVals (get .Values "cf-argocd-extras") }} -{{- $_ := set $context "Values" $vals.eventReporter }} +{{- $_ := set $context "Values" (get $vals .reporterComponentName) }} {{- $_ := set $context.Values "global" (deepCopy (get .Values "global")) }} {{/* Workaround to NOT change label selectors from previous runtime release when event-reporter was part of cf-argocd-extras Subchart */}} diff --git a/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_statefulset.yaml b/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_statefulset.yaml index ccbadd63..5c537f6e 100644 --- a/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_statefulset.yaml +++ b/charts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_statefulset.yaml @@ -5,7 +5,7 @@ {{- $defaultVals := include "cf-argocd-extras.default-values" . | fromYaml }} {{- $vals := mergeOverwrite $defaultVals (get .Values "cf-argocd-extras") }} -{{- $_ := set $context "Values" $vals.eventReporter }} +{{- $_ := set $context "Values" (get $vals .reporterComponentName) }} {{- $_ := set $context.Values "global" (deepCopy (get .Values "global")) }} {{- $_ := set $context.Values.podAnnotations "checksum/config" (include (print $.Template.BasePath "/cf-argocd-extras/event-reporter/configmap.yaml") . | sha256sum) }} @@ -15,6 +15,10 @@ {{- $_ := set $context.Values.container.env.REDIS_PASSWORD.valueFrom.secretKeyRef "key" (default "redis-password" $vals.externalRedis.existingSecretKeyRef.key) }} {{- end }} +{{- if not (index $context.Values.container.env "OTEL_SERVICE_NAME") }} + {{- $_ := set $context.Values.container.env "OTEL_SERVICE_NAME" $context.Values.fullnameOverride }} +{{- end }} + {{- if and (eq (index $context.Values "global" "external-argo-cd" "auth" "type") "token") }} {{- if not (index $context.Values "global" "external-argo-cd" "auth" "token") }} {{- $_ := set $context.Values.container.env "ARGO_CD_TOKEN_SECRET_NAME" (required ".Values.global.external-argo-cd.auth.type is set to 'token' therefore .Values.global.external-argo-cd.auth.tokenSecretKeyRef.name is required" (index $context.Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "name")) }} diff --git a/charts/gitops-runtime/templates/_components/event-reporters/_helpers.tpl b/charts/gitops-runtime/templates/_components/event-reporters/_helpers.tpl deleted file mode 100644 index 5e6b9fd4..00000000 --- a/charts/gitops-runtime/templates/_components/event-reporters/_helpers.tpl +++ /dev/null @@ -1,156 +0,0 @@ -{{/* -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 }} - atLeastOnce: {{ .atLeastOnce }} - {{- if .retryStrategy }} - retryStrategy: - {{- .retryStrategy | toYaml | nindent 4 }} - {{- end }} - {{- if .policy }} - policy: - {{- .policy | 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 }} 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 deleted file mode 100644 index b5b5bad1..00000000 --- a/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_event-source.yaml +++ /dev/null @@ -1,65 +0,0 @@ -{{- 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: {{ include "codefresh-gitops-runtime.eventbus.name" .Values.global.runtime.eventBus }} - 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: - metadata: - labels: - app.kubernetes.io/name: rollout-reporter-eventsource - 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 }} 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 deleted file mode 100644 index f7d12017..00000000 --- a/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_rbac.yaml +++ /dev/null @@ -1,29 +0,0 @@ -{{- define "event-reporters.rollout-reporter.rbac"}} -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: rollout-reporter-sa - labels: - {{- include "event-reporters.rollout-reporter.labels" . | nindent 4}} -rules: - - apiGroups: - - "*" - resources: - - "*" - verbs: - - "*" ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: rollout-reporter-sa - labels: - {{- include "event-reporters.rollout-reporter.labels" . | nindent 4}} -roleRef: - apiGroup: "" - kind: Role - name: rollout-reporter-sa -subjects: - - kind: ServiceAccount - name: {{ include "event-reporters.rollout-reporter.serviceAccountName" . }} -{{- end }} \ No newline at end of file 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 deleted file mode 100644 index 3021fbd2..00000000 --- a/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_sensor.yaml +++ /dev/null @@ -1,50 +0,0 @@ -{{- 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: {{ include "codefresh-gitops-runtime.eventbus.name" .Values.global.runtime.eventBus }} - template: - metadata: - labels: - app.kubernetes.io/name: rollout-reporter-sensor - 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 "policy" .Values.rollout.sensor.policy "atLeastOnce" .Values.rollout.sensor.atLeastOnce) | nindent 4 }} - {{- include "event-reporters.http.trigger" (dict "name" "replicasets" "Values" .Values "payloadDest" "data.object" "retryStrategy" .Values.rollout.sensor.retryStrategy "policy" .Values.rollout.sensor.policy "atLeastOnce" .Values.rollout.sensor.atLeastOnce) | nindent 4 }} - {{- include "event-reporters.http.trigger" (dict "name" "analysisruns" "Values" .Values "payloadDest" "data.object" "retryStrategy" .Values.rollout.sensor.retryStrategy "policy" .Values.rollout.sensor.policy "atLeastOnce" .Values.rollout.sensor.atLeastOnce) | nindent 4 }} - {{- include "event-reporters.log.trigger" (.Values.rollout.sensor.logging) | nindent 4 }} -{{- end }} diff --git a/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_serviceaccount.yaml b/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_serviceaccount.yaml deleted file mode 100644 index 1d2ae3f8..00000000 --- a/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_serviceaccount.yaml +++ /dev/null @@ -1,10 +0,0 @@ -{{- 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 }} \ No newline at end of file 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 deleted file mode 100644 index 97c6011d..00000000 --- a/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_event-source.yaml +++ /dev/null @@ -1,46 +0,0 @@ -{{- 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: {{ include "codefresh-gitops-runtime.eventbus.name" .Values.global.runtime.eventBus }} - resource: - workflows: - eventTypes: - - ADD - - UPDATE - - DELETE - filter: - createdBy: null - namespace: {{ .Release.Namespace }} - group: argoproj.io - resource: workflows - version: v1alpha1 - template: - metadata: - labels: - app.kubernetes.io/name: workflow-reporter-eventsource - 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 }} diff --git a/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_rbac.yaml b/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_rbac.yaml deleted file mode 100644 index 3ca63fc7..00000000 --- a/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_rbac.yaml +++ /dev/null @@ -1,29 +0,0 @@ -{{- define "event-reporters.workflow-reporter.rbac"}} -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: workflow-reporter - labels: - {{- include "event-reporters.workflow-reporter.labels" . | nindent 4 }} -rules: - - apiGroups: - - "*" - resources: - - "*" - verbs: - - "*" ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: workflow-reporter - labels: - {{- include "event-reporters.workflow-reporter.labels" . | nindent 4 }} -roleRef: - apiGroup: "" - kind: Role - name: workflow-reporter -subjects: - - kind: ServiceAccount - name: {{ include "event-reporters.workflow-reporter.serviceAccountName" .}} -{{- end }} 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 deleted file mode 100644 index 6a5206d6..00000000 --- a/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_sensor.yaml +++ /dev/null @@ -1,42 +0,0 @@ -{{- define "event-reporters.workflow-reporter.sensor"}} -apiVersion: argoproj.io/v1alpha1 -kind: Sensor -metadata: - name: workflow-reporter - labels: - {{- include "event-reporters.workflow-reporter.labels" . | nindent 4 }} -spec: - replicas: {{ .Values.workflow.sensor.replicas }} - dependencies: - - eventName: workflows - eventSourceName: workflow-reporter - name: workflows - eventBusName: {{ include "codefresh-gitops-runtime.eventbus.name" .Values.global.runtime.eventBus }} - template: - metadata: - labels: - app.kubernetes.io/name: workflow-reporter-sensor - serviceAccountName: {{ include "event-reporters.workflow-reporter.serviceAccountName" .}} - container: - name: "" - {{- include "codefresh-gitops-runtime.components.common_helpers.container-templates.env-vars" .Values.workflow.sensor.env | nindent 6 }} - resources: - {{- with .Values.workflow.sensor.resources }} - {{- . | toYaml | nindent 8 }} - {{- end }} - tolerations: - {{- with .Values.workflow.sensor.tolerations | default .Values.global.tolerations}} - {{- . | toYaml | nindent 6 }} - {{- end }} - nodeSelector: - {{- with .Values.workflow.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" "workflows" "Values" .Values "payloadDest" "data.object" "retryStrategy" .Values.workflow.sensor.retryStrategy "policy" .Values.workflow.sensor.policy "atLeastOnce" .Values.workflow.sensor.atLeastOnce) | nindent 4 }} - {{- include "event-reporters.log.trigger" (.Values.workflow.sensor.logging) | nindent 4 }} -{{- end }} diff --git a/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_serviceaccount.yaml b/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_serviceaccount.yaml deleted file mode 100644 index 023a4c84..00000000 --- a/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_serviceaccount.yaml +++ /dev/null @@ -1,10 +0,0 @@ -{{- define "event-reporters.workflow-reporter.sa"}} - {{- if .Values.workflow.serviceAccount.create }} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "event-reporters.workflow-reporter.serviceAccountName" .}} - labels: - {{- include "event-reporters.workflow-reporter.labels" . | nindent 4 }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/configmap.yaml b/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/configmap.yaml index 536185fb..43fe0198 100644 --- a/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/configmap.yaml +++ b/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/configmap.yaml @@ -1 +1 @@ -{{- include "cf-argocd-extras.event-reporter.configmap" . }} +{{- include "cf-argocd-extras.event-reporter.configmap" (merge (dict "reporterComponentName" "eventReporter") .) }} diff --git a/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/pdb.yaml b/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/pdb.yaml index f0d5e459..f58342f8 100644 --- a/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/pdb.yaml +++ b/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/pdb.yaml @@ -1 +1 @@ -{{- include "cf-argocd-extras.event-reporter.pdb" . }} +{{- include "cf-argocd-extras.event-reporter.pdb" (merge (dict "reporterComponentName" "eventReporter") .) }} diff --git a/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/rbac.yaml b/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/rbac.yaml index a2ecb9d6..7652ef88 100644 --- a/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/rbac.yaml +++ b/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/rbac.yaml @@ -1 +1 @@ -{{- include "cf-argocd-extras.event-reporter.rbac" . }} +{{- include "cf-argocd-extras.event-reporter.rbac" (merge (dict "reporterComponentName" "eventReporter") .) }} diff --git a/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/service.yaml b/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/service.yaml index 1666e60e..0e7f828b 100644 --- a/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/service.yaml +++ b/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/service.yaml @@ -1 +1 @@ -{{- include "cf-argocd-extras.event-reporter.service" . }} +{{- include "cf-argocd-extras.event-reporter.service" (merge (dict "reporterComponentName" "eventReporter") .) }} diff --git a/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/serviceMonitor.yaml b/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/serviceMonitor.yaml index 63c88afe..82243bf2 100644 --- a/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/serviceMonitor.yaml +++ b/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/serviceMonitor.yaml @@ -1 +1 @@ -{{- include "cf-argocd-extras.event-reporter.serviceMonitor" . }} +{{- include "cf-argocd-extras.event-reporter.serviceMonitor" (merge (dict "reporterComponentName" "eventReporter") .) }} diff --git a/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/statefulset.yaml b/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/statefulset.yaml index ad89d91e..a64f3f91 100644 --- a/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/statefulset.yaml +++ b/charts/gitops-runtime/templates/cf-argocd-extras/event-reporter/statefulset.yaml @@ -1 +1 @@ -{{- include "cf-argocd-extras.event-reporter.statefulset" . }} +{{- include "cf-argocd-extras.event-reporter.statefulset" (merge (dict "reporterComponentName" "eventReporter") .) }} diff --git a/charts/gitops-runtime/templates/cf-argocd-extras/resource-reporter/configmap.yaml b/charts/gitops-runtime/templates/cf-argocd-extras/resource-reporter/configmap.yaml new file mode 100644 index 00000000..81caff6a --- /dev/null +++ b/charts/gitops-runtime/templates/cf-argocd-extras/resource-reporter/configmap.yaml @@ -0,0 +1 @@ +{{- include "cf-argocd-extras.event-reporter.configmap" (merge (dict "reporterComponentName" "resourceReporter") .) }} diff --git a/charts/gitops-runtime/templates/cf-argocd-extras/resource-reporter/pdb.yaml b/charts/gitops-runtime/templates/cf-argocd-extras/resource-reporter/pdb.yaml new file mode 100644 index 00000000..2d78a2e0 --- /dev/null +++ b/charts/gitops-runtime/templates/cf-argocd-extras/resource-reporter/pdb.yaml @@ -0,0 +1 @@ +{{- include "cf-argocd-extras.event-reporter.pdb" (merge (dict "reporterComponentName" "resourceReporter") .) }} diff --git a/charts/gitops-runtime/templates/cf-argocd-extras/resource-reporter/rbac.yaml b/charts/gitops-runtime/templates/cf-argocd-extras/resource-reporter/rbac.yaml new file mode 100644 index 00000000..dc28966d --- /dev/null +++ b/charts/gitops-runtime/templates/cf-argocd-extras/resource-reporter/rbac.yaml @@ -0,0 +1 @@ +{{- include "cf-argocd-extras.event-reporter.rbac" (merge (dict "reporterComponentName" "resourceReporter") .) }} diff --git a/charts/gitops-runtime/templates/cf-argocd-extras/resource-reporter/service.yaml b/charts/gitops-runtime/templates/cf-argocd-extras/resource-reporter/service.yaml new file mode 100644 index 00000000..b1402746 --- /dev/null +++ b/charts/gitops-runtime/templates/cf-argocd-extras/resource-reporter/service.yaml @@ -0,0 +1 @@ +{{- include "cf-argocd-extras.event-reporter.service" (merge (dict "reporterComponentName" "resourceReporter") .) }} diff --git a/charts/gitops-runtime/templates/cf-argocd-extras/resource-reporter/serviceMonitor.yaml b/charts/gitops-runtime/templates/cf-argocd-extras/resource-reporter/serviceMonitor.yaml new file mode 100644 index 00000000..3587c80f --- /dev/null +++ b/charts/gitops-runtime/templates/cf-argocd-extras/resource-reporter/serviceMonitor.yaml @@ -0,0 +1 @@ +{{- include "cf-argocd-extras.event-reporter.serviceMonitor" (merge (dict "reporterComponentName" "resourceReporter") .) }} diff --git a/charts/gitops-runtime/templates/cf-argocd-extras/resource-reporter/statefulset.yaml b/charts/gitops-runtime/templates/cf-argocd-extras/resource-reporter/statefulset.yaml new file mode 100644 index 00000000..d75c02f1 --- /dev/null +++ b/charts/gitops-runtime/templates/cf-argocd-extras/resource-reporter/statefulset.yaml @@ -0,0 +1 @@ +{{- include "cf-argocd-extras.event-reporter.statefulset" (merge (dict "reporterComponentName" "resourceReporter") .) }} diff --git a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/clusterrolebinding.yaml b/charts/gitops-runtime/templates/event-reporters/rollout-reporter/clusterrolebinding.yaml deleted file mode 100644 index 534ac500..00000000 --- a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/clusterrolebinding.yaml +++ /dev/null @@ -1,24 +0,0 @@ -{{/* 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 or (index (get .Values "argo-rollouts") "enabled") (and (not (index (get .Values "argo-rollouts") "enabled")) (index .Values.global "external-argo-rollouts" "rollout-reporter" "enabled" )) }} - {{- if or (and (index (get .Values "argo-rollouts") "clusterInstall") (index (get .Values "argo-rollouts") "controller" "createClusterRole")) (and (not (index (get .Values "argo-rollouts") "enabled")) (index .Values.global "external-argo-rollouts" "rollout-reporter" "enabled" ))}} - {{- $eventReporterContext := deepCopy . }} - {{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }} - {{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: codefresh-rollouts-reporter - labels: - {{- include "event-reporters.rollout-reporter.labels" . | nindent 4}} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ include "codefresh-gitops-runtime.argo-rollouts.name" . }} -subjects: - - kind: ServiceAccount - name: {{ include "event-reporters.rollout-reporter.serviceAccountName" $eventReporterContext }} - namespace: {{ .Release.Namespace }} - {{- end }} -{{- end }} diff --git a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/eventsource.yaml b/charts/gitops-runtime/templates/event-reporters/rollout-reporter/eventsource.yaml deleted file mode 100644 index ea09f3a1..00000000 --- a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/eventsource.yaml +++ /dev/null @@ -1,6 +0,0 @@ -{{- if or (index (get .Values "argo-rollouts") "enabled") (and (not (index (get .Values "argo-rollouts") "enabled")) (index .Values.global "external-argo-rollouts" "rollout-reporter" "enabled" )) }} - {{- $eventReporterContext := deepCopy . }} - {{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }} - {{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }} - {{- include "event-reporters.rollout-reporter.eventsource" $eventReporterContext }} -{{- end }} diff --git a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/rbac.yaml b/charts/gitops-runtime/templates/event-reporters/rollout-reporter/rbac.yaml deleted file mode 100644 index bb2c051f..00000000 --- a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/rbac.yaml +++ /dev/null @@ -1,6 +0,0 @@ -{{- if or (index (get .Values "argo-rollouts") "enabled") (and (not (index (get .Values "argo-rollouts") "enabled")) (index .Values.global "external-argo-rollouts" "rollout-reporter" "enabled" )) }} - {{- $eventReporterContext := deepCopy . }} - {{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }} - {{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }} - {{- include "event-reporters.rollout-reporter.rbac" $eventReporterContext }} -{{- end }} diff --git a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/sensor.yaml b/charts/gitops-runtime/templates/event-reporters/rollout-reporter/sensor.yaml deleted file mode 100644 index 571b2019..00000000 --- a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/sensor.yaml +++ /dev/null @@ -1,11 +0,0 @@ -{{- if or (index (get .Values "argo-rollouts") "enabled") (and (not (index (get .Values "argo-rollouts") "enabled")) (index .Values.global "external-argo-rollouts" "rollout-reporter" "enabled" )) }} - {{- $eventReporterContext := deepCopy . }} - {{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }} - {{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }} - - {{- $globalProxyEnv := (include "codefresh-gitops-runtime.get-proxy-env-vars" . | fromYaml) }} - {{- $mergedEnv := mergeOverwrite $globalProxyEnv $eventReporterContext.Values.rollout.sensor.env }} - {{- $_ := set $eventReporterContext.Values.rollout.sensor "env" $mergedEnv }} - - {{- include "event-reporters.rollout-reporter.sensor" $eventReporterContext }} -{{- end }} diff --git a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/serviceaccount.yaml b/charts/gitops-runtime/templates/event-reporters/rollout-reporter/serviceaccount.yaml deleted file mode 100644 index ddf72053..00000000 --- a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/serviceaccount.yaml +++ /dev/null @@ -1,6 +0,0 @@ -{{- if or (index (get .Values "argo-rollouts") "enabled") (and (not (index (get .Values "argo-rollouts") "enabled")) (index .Values.global "external-argo-rollouts" "rollout-reporter" "enabled" )) }} - {{- $eventReporterContext := deepCopy . }} - {{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }} - {{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }} - {{- include "event-reporters.rollout-reporter.sa" $eventReporterContext }} -{{- end }} diff --git a/charts/gitops-runtime/templates/event-reporters/workflow-reporter/eventsource.yaml b/charts/gitops-runtime/templates/event-reporters/workflow-reporter/eventsource.yaml deleted file mode 100644 index fb23ffd8..00000000 --- a/charts/gitops-runtime/templates/event-reporters/workflow-reporter/eventsource.yaml +++ /dev/null @@ -1,7 +0,0 @@ - -{{- if index (get .Values "argo-workflows") "enabled" }} - {{- $eventReporterContext := deepCopy . }} - {{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }} - {{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }} - {{- include "event-reporters.workflow-reporter.eventsource" $eventReporterContext }} -{{- end }} diff --git a/charts/gitops-runtime/templates/event-reporters/workflow-reporter/rbac.yaml b/charts/gitops-runtime/templates/event-reporters/workflow-reporter/rbac.yaml deleted file mode 100644 index 93e17e40..00000000 --- a/charts/gitops-runtime/templates/event-reporters/workflow-reporter/rbac.yaml +++ /dev/null @@ -1,7 +0,0 @@ - -{{- if index (get .Values "argo-workflows") "enabled" }} - {{- $eventReporterContext := deepCopy . }} - {{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }} - {{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }} - {{- include "event-reporters.workflow-reporter.rbac" $eventReporterContext }} -{{- end }} diff --git a/charts/gitops-runtime/templates/event-reporters/workflow-reporter/sensor.yaml b/charts/gitops-runtime/templates/event-reporters/workflow-reporter/sensor.yaml deleted file mode 100644 index 97f73fb7..00000000 --- a/charts/gitops-runtime/templates/event-reporters/workflow-reporter/sensor.yaml +++ /dev/null @@ -1,12 +0,0 @@ - -{{- if index (get .Values "argo-workflows") "enabled" }} - {{- $eventReporterContext := deepCopy . }} - {{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }} - {{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }} - - {{- $globalProxyEnv := (include "codefresh-gitops-runtime.get-proxy-env-vars" . | fromYaml) }} - {{- $mergedEnv := mergeOverwrite $globalProxyEnv $eventReporterContext.Values.workflow.sensor.env }} - {{- $_ := set $eventReporterContext.Values.workflow.sensor "env" $mergedEnv }} - - {{- include "event-reporters.workflow-reporter.sensor" $eventReporterContext }} -{{- end }} diff --git a/charts/gitops-runtime/templates/event-reporters/workflow-reporter/serviceaccount.yaml b/charts/gitops-runtime/templates/event-reporters/workflow-reporter/serviceaccount.yaml deleted file mode 100644 index c78179dc..00000000 --- a/charts/gitops-runtime/templates/event-reporters/workflow-reporter/serviceaccount.yaml +++ /dev/null @@ -1,7 +0,0 @@ - -{{- if index (get .Values "argo-workflows") "enabled" }} - {{- $eventReporterContext := deepCopy . }} - {{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }} - {{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }} - {{- include "event-reporters.workflow-reporter.sa" $eventReporterContext }} -{{- end }} diff --git a/charts/gitops-runtime/tests/event-reporters-sensors_test.yaml b/charts/gitops-runtime/tests/event-reporters-sensors_test.yaml deleted file mode 100644 index 23bb0542..00000000 --- a/charts/gitops-runtime/tests/event-reporters-sensors_test.yaml +++ /dev/null @@ -1,311 +0,0 @@ -suite: Test on event reporters sensors -templates: - - event-reporters/workflow-reporter/sensor.yaml - - event-reporters/rollout-reporter/sensor.yaml -tests: - - it: Setting api/events url works - workflow reporter - template: 'event-reporters/workflow-reporter/sensor.yaml' - values: - - './values/mandatory-values.yaml' - set: - global.codefresh.url: "https://my.platform" - global.codefresh.apiEventsPath: "/api-events" - asserts: - - equal: - path: spec.triggers[0].template.http.url - value: https://my.platform/api-events - - - it: Setting api/events url works - rollout reporter - template: 'event-reporters/rollout-reporter/sensor.yaml' - values: - - './values/mandatory-values.yaml' - set: - global.codefresh.url: "https://my.platform" - global.codefresh.apiEventsPath: "/api-events" - asserts: - - equal: - path: spec.triggers[0].template.http.url - value: https://my.platform/api-events - - equal: - path: spec.triggers[1].template.http.url - value: https://my.platform/api-events - - equal: - path: spec.triggers[2].template.http.url - value: https://my.platform/api-events - - - it: Setting various container specs - workflow reporter - template: 'event-reporters/workflow-reporter/sensor.yaml' - values: - - './values/mandatory-values.yaml' - set: - event-reporters.workflow.sensor: - replicas: 2 - resources: - requests: - memory: 1Gi - env: - DEBUG_LOG: "true" - tolerations: - - key: "example-key" - operator: "Exists" - effect: "NoSchedule" - nodeSelector: - region: east - type: user-node - affinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: topology.kubernetes.io/zone - operator: In - values: - - antarctica-east1 - - antarctica-west1 - asserts: - - equal: - path: spec.replicas - value: 2 - - equal: - path: spec.template.container.env - value: - - name: DEBUG_LOG - value: "true" - - equal: - path: spec.template.container.resources - value: - requests: - memory: 1Gi - - equal: - path: spec.template.tolerations - value: - - key: "example-key" - operator: "Exists" - effect: "NoSchedule" - - equal: - path: spec.template.nodeSelector - value: - region: east - type: user-node - - - it: Setting various container specs - rollout reporter - template: 'event-reporters/rollout-reporter/sensor.yaml' - values: - - './values/mandatory-values.yaml' - set: - event-reporters.rollout.sensor: - replicas: 2 - resources: - requests: - memory: 1Gi - env: - DEBUG_LOG: "true" - tolerations: - - key: "example-key" - operator: "Exists" - effect: "NoSchedule" - nodeSelector: - region: east - type: user-node - affinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: topology.kubernetes.io/zone - operator: In - values: - - antarctica-east1 - - antarctica-west1 - asserts: - - equal: - path: spec.replicas - value: 2 - - equal: - path: spec.template.container.env - value: - - name: DEBUG_LOG - value: "true" - - equal: - path: spec.template.container.resources - value: - requests: - memory: 1Gi - - equal: - path: spec.template.tolerations - value: - - key: "example-key" - operator: "Exists" - effect: "NoSchedule" - - equal: - path: spec.template.nodeSelector - value: - region: east - type: user-node - - - it: Logging without interval works - workflow reporter - template: 'event-reporters/workflow-reporter/sensor.yaml' - values: - - './values/mandatory-values.yaml' - set: - event-reporters.workflow.sensor: - logging: - enabled: true - asserts: - - contains: - path: spec.triggers - content: - template: - log: {} - name: log-trigger - - - it: Logging without interval works - rollout reporter - template: 'event-reporters/rollout-reporter/sensor.yaml' - values: - - './values/mandatory-values.yaml' - set: - event-reporters.rollout.sensor: - logging: - enabled: true - asserts: - - contains: - path: spec.triggers - content: - template: - log: {} - name: log-trigger - - - it: Logging with interval works - workflow reporter - template: 'event-reporters/workflow-reporter/sensor.yaml' - values: - - './values/mandatory-values.yaml' - set: - event-reporters.workflow.sensor: - logging: - intervalSeconds: 60 - enabled: true - asserts: - - contains: - path: spec.triggers - content: - template: - log: - intervalSeconds: 60 - name: log-trigger - - - it: HTTP trigger contains retries if set - workflow reporter - template: 'event-reporters/workflow-reporter/sensor.yaml' - values: - - './values/mandatory-values.yaml' - set: - event-reporters.workflow.sensor: - retryStrategy: - steps: 3 - duration: 1 - factor: 1.2 - jitter: 3 - asserts: - - equal: - path: spec.triggers[0].retryStrategy - value: - steps: 3 - duration: 1 - factor: 1.2 - jitter: 3 - - - it: HTTP trigger contains retries if set - rollout reporter - template: 'event-reporters/rollout-reporter/sensor.yaml' - values: - - './values/mandatory-values.yaml' - set: - event-reporters.rollout.sensor: - retryStrategy: - steps: 3 - duration: 1 - factor: 1.2 - jitter: 3 - asserts: - - equal: - path: spec.triggers[0].retryStrategy - value: - steps: 3 - duration: 1 - factor: 1.2 - jitter: 3 - - equal: - path: spec.triggers[1].retryStrategy - value: - steps: 3 - duration: 1 - factor: 1.2 - jitter: 3 - - equal: - path: spec.triggers[2].retryStrategy - value: - steps: 3 - duration: 1 - factor: 1.2 - jitter: 3 - - - it: HTTP trigger contains policy if set - workflow reporter - template: 'event-reporters/workflow-reporter/sensor.yaml' - values: - - './values/mandatory-values.yaml' - set: - event-reporters.workflow.sensor: - policy: - status: - allow: - - 200 - asserts: - - equal: - path: spec.triggers[0].policy - value: - status: - allow: - - 200 - - - it: HTTP trigger contains atLeastOnce if unset - rollout reporter - template: 'event-reporters/rollout-reporter/sensor.yaml' - values: - - './values/mandatory-values.yaml' - set: - event-reporters.rollout.sensor: - atLeastOnce: false - asserts: - - equal: - path: spec.triggers[0].atLeastOnce - value: false - - - - it: HTTP trigger contains atLeastOnce if unset - workflow reporter - template: 'event-reporters/workflow-reporter/sensor.yaml' - values: - - './values/mandatory-values.yaml' - set: - event-reporters.workflow.sensor: - atLeastOnce: false - asserts: - - equal: - path: spec.triggers[0].atLeastOnce - value: false - - - it: uses the correct eventBusName if type is jetstream - rollout reporter - template: 'event-reporters/rollout-reporter/sensor.yaml' - values: - - './values/mandatory-values.yaml' - set: - global.runtime.eventBus.type: jetstream - asserts: - - equal: - path: spec.eventBusName - value: codefresh-eventbus-jetstream - - - it: uses the correct eventBusName if type is jetstream - workflow reporter - template: 'event-reporters/workflow-reporter/sensor.yaml' - values: - - './values/mandatory-values.yaml' - set: - global.runtime.eventBus.type: jetstream - asserts: - - equal: - path: spec.eventBusName - value: codefresh-eventbus-jetstream diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index de5b2682..5d62ad52 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -760,8 +760,8 @@ cf-argocd-extras: container: image: registry: quay.io - repository: codefresh/cf-argocd-extras - tag: 88898aa + repository: codefresh/dev/cf-argocd-extras + tag: cr-30629-resource-reporter-workqueu-2-66d7459 nodeSelector: {} tolerations: [] affinity: {} @@ -778,14 +778,39 @@ cf-argocd-extras: main: # -- Enable ServiceMonitor for event reporter enabled: false + labels: {} + resourceReporter: + enabled: true + container: + image: + registry: quay.io + repository: codefresh/dev/cf-argocd-extras + tag: cr-30629-resource-reporter-workqueu-2-66d7459 + nodeSelector: {} + tolerations: [] + affinity: {} + resources: + requests: + memory: "128Mi" + cpu: "100m" + pdb: + # -- Enable PDB for event-reporter + enabled: false + minAvailable: "50%" + maxUnavailable: "" + serviceMonitor: + main: + # -- Enable ServiceMonitor for event reporter + enabled: false + labels: {} # -- Sources server configuration sourcesServer: enabled: true container: image: registry: quay.io - repository: codefresh/cf-argocd-extras - tag: 88898aa + repository: codefresh/dev/cf-argocd-extras + tag: cr-30629-resource-reporter-workqueu-2-66d7459 nodeSelector: {} tolerations: [] affinity: {} diff --git a/scripts/prepare-release.sh b/scripts/prepare-release.sh index 452febf8..1ba50119 100755 --- a/scripts/prepare-release.sh +++ b/scripts/prepare-release.sh @@ -9,7 +9,7 @@ docker run \ -e GITHUB_TOKEN=$(gh auth token) \ -u $(id -u) \ --rm \ - quay.io/codefresh/gitops-runtime-scripts /scripts/prepare-release.sh + gitops-runtime-scripts:local /scripts/prepare-release.sh docker run \ -v "$(pwd):/helm-docs" \