diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml index 185693b2..754a2711 100644 --- a/charts/gitops-runtime/Chart.yaml +++ b/charts/gitops-runtime/Chart.yaml @@ -16,7 +16,7 @@ annotations: dependencies: - name: argo-cd repository: https://codefresh-io.github.io/argo-helm - version: 6.11.1-6-cap-2.11-2024.7.30-a31bf96bb + version: 6.11.1-7-cap-2.11-2024.8.19-6be897266 - name: argo-events repository: https://codefresh-io.github.io/argo-helm version: 2.4.7-1-cap-CR-24607 diff --git a/charts/gitops-runtime/README.md b/charts/gitops-runtime/README.md index 5ae37b6d..0becddfc 100644 --- a/charts/gitops-runtime/README.md +++ b/charts/gitops-runtime/README.md @@ -100,14 +100,14 @@ sealed-secrets: | app-proxy.image-enrichment.serviceAccount.name | string | `"codefresh-image-enrichment-sa"` | Name of the service account to create or the name of the existing one to use | | app-proxy.image.pullPolicy | string | `"IfNotPresent"` | | | app-proxy.image.repository | string | `"quay.io/codefresh/cap-app-proxy"` | | -| app-proxy.image.tag | string | `"1.2946.0"` | | +| app-proxy.image.tag | string | `"1.2969.0"` | | | app-proxy.imagePullSecrets | list | `[]` | | | app-proxy.initContainer.command[0] | string | `"./init.sh"` | | | app-proxy.initContainer.env | object | `{}` | | | app-proxy.initContainer.extraVolumeMounts | list | `[]` | Extra volume mounts for init container | | app-proxy.initContainer.image.pullPolicy | string | `"IfNotPresent"` | | | app-proxy.initContainer.image.repository | string | `"quay.io/codefresh/cap-app-proxy-init"` | | -| app-proxy.initContainer.image.tag | string | `"1.2946.0"` | | +| app-proxy.initContainer.image.tag | string | `"1.2969.0"` | | | app-proxy.initContainer.resources.limits.cpu | string | `"1"` | | | app-proxy.initContainer.resources.limits.memory | string | `"512Mi"` | | | app-proxy.initContainer.resources.requests.cpu | string | `"0.2"` | | @@ -167,26 +167,6 @@ sealed-secrets: | argo-workflows.fullnameOverride | string | `"argo"` | | | argo-workflows.server.authModes | list | `["client"]` | auth-mode needs to be set to client to be able to see workflow logs from Codefresh UI | | argo-workflows.server.baseHref | string | `"/workflows/"` | Do not change. Workflows UI is only accessed through internal router, changing this values will break routing to workflows native UI from Codefresh. | -| event-reporters.events.argoCDServerServiceName | string | `nil` | LEAVE EMPTY and let the chart logic determine the name. Change only if you are totally sure you need to override ArgoCD service name. | -| event-reporters.events.argoCDServerServicePort | string | `nil` | LEAVE EMPTY and let the chart logic determine the name. Change only if you are totally sure you need to override ArgoCD service port. | -| event-reporters.events.eventSource.affinity | object | `{}` | | -| event-reporters.events.eventSource.nodeSelector | object | `{}` | | -| event-reporters.events.eventSource.replicas | int | `1` | | -| event-reporters.events.eventSource.resources | object | `{}` | | -| event-reporters.events.eventSource.tolerations | list | `[]` | | -| event-reporters.events.sensor.affinity | object | `{}` | | -| event-reporters.events.sensor.env | object | `{}` | Environment variables for sensor pods - add DEBUG_LOG: "true" to add debug level logs | -| event-reporters.events.sensor.logging | object | `{"enabled":false,"intervalSeconds":0}` | Set to true to enable logging. Set intervalSeconds to add logging interval to moderate log flow. | -| event-reporters.events.sensor.nodeSelector | object | `{}` | | -| event-reporters.events.sensor.replicas | int | `1` | | -| event-reporters.events.sensor.resources | object | `{}` | | -| event-reporters.events.sensor.retryStrategy | object | `{"duration":0,"factor":1,"jitter":1,"steps":3}` | Retry strategy for events sent to Codefresh | -| event-reporters.events.sensor.retryStrategy.duration | int | `0` | The initial duration, use strings like "2s", "1m" | -| event-reporters.events.sensor.retryStrategy.factor | float | `1` | Duration is multiplied by factor each retry, if factor is not zero and steps limit has not been reached. Should not be negative | -| event-reporters.events.sensor.retryStrategy.jitter | int | `1` | The sleep between each retry is the duration plus an additional amount chosen uniformly at random from the interval between zero and `jitter * duration`. | -| event-reporters.events.sensor.retryStrategy.steps | int | `3` | Number of retries | -| event-reporters.events.sensor.tolerations | list | `[]` | | -| event-reporters.events.serviceAccount.create | bool | `true` | | | event-reporters.rollout.eventSource.affinity | object | `{}` | | | event-reporters.rollout.eventSource.nodeSelector | object | `{}` | | | event-reporters.rollout.eventSource.replicas | int | `1` | | diff --git a/charts/gitops-runtime/templates/_components/event-reporters/_helpers.tpl b/charts/gitops-runtime/templates/_components/event-reporters/_helpers.tpl index b9c2ec81..f8dd300e 100644 --- a/charts/gitops-runtime/templates/_components/event-reporters/_helpers.tpl +++ b/charts/gitops-runtime/templates/_components/event-reporters/_helpers.tpl @@ -1,19 +1,3 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "event-reporters.events-reporter.name" -}} -{{- print "events-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.events-reporter.fullname" -}} -{{- print "events-reporter"}} -{{- end }} - {{/* Create chart name and version as used by the chart label. */}} @@ -21,37 +5,6 @@ Create chart name and version as used by the chart label. {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} {{- end }} -{{/* -Common labels -*/}} -{{- define "event-reporters.events-reporter.labels" -}} -helm.sh/chart: {{ include "event-reporters.chart" . }} -{{ include "event-reporters.events-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.events-reporter.selectorLabels" -}} -app.kubernetes.io/part-of: events-reporter -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "event-reporters.events-reporter.serviceAccountName" -}} - {{- if .Values.events.serviceAccount.create }} - {{- default (include "event-reporters.events-reporter.fullname" .) .Values.events.serviceAccount.name }} - {{- else }} - {{- default "default" .Values.events.serviceAccount.name }} - {{- end }} -{{- end }} - {{/* Expand the name of the chart. */}} 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 deleted file mode 100644 index 65a2fc50..00000000 --- a/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_event-source.yaml +++ /dev/null @@ -1,38 +0,0 @@ -{{- define "event-reporters.events-reporter.eventsource"}} -apiVersion: argoproj.io/v1alpha1 -kind: EventSource -metadata: - labels: - {{- include "event-reporters.events-reporter.labels" . | nindent 4}} - name: events-reporter -spec: - replicas: {{ .Values.events.eventSource.replicas }} - eventBusName: {{ default "codefresh-eventbus" .Values.global.runtime.eventBus.name }} - generic: - events: - authSecret: - key: token - name: argocd-token - config: '{}' - insecure: true - url: {{ printf "%s:%s" .Values.events.argoCDServerServiceName .Values.events.argoCDServerServicePort }} - template: - serviceAccountName: {{ include "event-reporters.events-reporter.serviceAccountName" .}} - container: - resources: - {{- with .Values.events.eventSource.resources }} - {{- . | toYaml | nindent 8 }} - {{- end }} - tolerations: - {{- with .Values.events.eventSource.tolerations }} - {{- . | toYaml | nindent 6 }} - {{- end }} - nodeSelector: - {{- with .Values.events.eventSource.nodeSelector }} - {{- . | toYaml | nindent 6 }} - {{- end }} - affinity: - {{- with .Values.events.eventSource.affinity }} - {{- . | toYaml | nindent 6 }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_rbac.yaml b/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_rbac.yaml deleted file mode 100644 index aba7c95e..00000000 --- a/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_rbac.yaml +++ /dev/null @@ -1,24 +0,0 @@ -{{- define "event-reporters.events-reporter.rbac"}} -# allow default service account to read the codefresh-cm configmap -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: events-reporter -rules: - - apiGroups: [""] - resources: ["configmaps", "secrets"] - resourceNames: ["codefresh-cm", "codefresh-token"] - verbs: ["get"] ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: events-reporter -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: events-reporter -subjects: - - kind: ServiceAccount - name: {{ include "event-reporters.events-reporter.serviceAccountName" .}} -{{- end }} \ No newline at end of file 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 deleted file mode 100644 index 41f2b062..00000000 --- a/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_sensor.yaml +++ /dev/null @@ -1,38 +0,0 @@ -{{- define "event-reporters.events-reporter.sensor"}} -apiVersion: argoproj.io/v1alpha1 -kind: Sensor -metadata: - name: events-reporter - labels: - {{- include "event-reporters.events-reporter.labels" . | nindent 4}} -spec: - replicas: {{ .Values.events.sensor.replicas }} - dependencies: - - name: events - eventSourceName: events-reporter - eventName: events - eventBusName: {{ default "codefresh-eventbus" .Values.global.runtime.eventBus.name }} - template: - serviceAccountName: {{ include "event-reporters.events-reporter.serviceAccountName" .}} - container: - {{- include "codefresh-gitops-runtime.components.common_helpers.container-templates.env-vars" .Values.events.sensor.env | nindent 6 }} - resources: - {{- with .Values.events.sensor.resources }} - {{- . | toYaml | nindent 8 }} - {{- end }} - tolerations: - {{- with .Values.events.sensor.tolerations }} - {{- . | toYaml | nindent 6 }} - {{- end }} - nodeSelector: - {{- with .Values.events.sensor.nodeSelector }} - {{- . | toYaml | nindent 6 }} - {{- end }} - affinity: - {{- with .Values.events.sensor.affinity }} - {{- . | toYaml | nindent 6 }} - {{- end }} - triggers: - {{- include "event-reporters.http.trigger" (dict "name" "events" "Values" .Values "payloadDest" "data" "retryStrategy" .Values.events.sensor.retryStrategy) | nindent 4 }} - {{- include "event-reporters.log.trigger" (.Values.events.sensor.logging) | nindent 4 }} -{{- end }} diff --git a/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_serviceaccount.yaml b/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_serviceaccount.yaml deleted file mode 100644 index a5ee2bf6..00000000 --- a/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_serviceaccount.yaml +++ /dev/null @@ -1,11 +0,0 @@ - -{{- define "event-reporters.events-reporter.sa"}} - {{- if .Values.events.serviceAccount.create }} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "event-reporters.events-reporter.serviceAccountName" .}} - labels: - {{- include "event-reporters.events-reporter.labels" . | nindent 4 }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/gitops-runtime/templates/_helpers.tpl b/charts/gitops-runtime/templates/_helpers.tpl index 7e504463..93a38f41 100644 --- a/charts/gitops-runtime/templates/_helpers.tpl +++ b/charts/gitops-runtime/templates/_helpers.tpl @@ -234,9 +234,8 @@ Output comma separated list of installed runtime components {{- $argoEvents := dict "name" "argo-events" "version" (get .Subcharts "argo-events").Chart.AppVersion }} {{- $sealedSecrets := dict "name" "sealed-secrets" "version" (get .Subcharts "sealed-secrets").Chart.AppVersion }} {{- $internalRouter := dict "name" "internal-router" "version" .Chart.AppVersion }} - {{- $eventsReporter := dict "name" "events-reporter" "version" .Chart.AppVersion }} {{- $appProxy := dict "name" "app-proxy" "version" (index (get .Values "app-proxy") "image" "tag") }} - {{- $comptList := list $argoCD $argoEvents $appProxy $eventsReporter $sealedSecrets $internalRouter}} + {{- $comptList := list $argoCD $argoEvents $appProxy $sealedSecrets $internalRouter}} {{- if index (get .Values "argo-rollouts") "enabled" }} {{- $rolloutReporter := dict "name" "rollout-reporter" "version" .Chart.AppVersion }} {{- $argoRollouts := dict "name" "argo-rollouts" "version" (get .Subcharts "argo-rollouts").Chart.AppVersion }} diff --git a/charts/gitops-runtime/templates/event-reporters/events-reporter/eventsource.yaml b/charts/gitops-runtime/templates/event-reporters/events-reporter/eventsource.yaml deleted file mode 100644 index f5396885..00000000 --- a/charts/gitops-runtime/templates/event-reporters/events-reporter/eventsource.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- $eventReporterContext := deepCopy . }} -{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }} -{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }} -# should allow overwriting in values.yaml -{{- $argoCDServerServiceName := (include "codefresh-gitops-runtime.argocd.server.servicename" .) -}} -{{- $argoCDServerServicePort := ( include "codefresh-gitops-runtime.argocd.server.serviceport" . ) -}} -{{- if $eventReporterContext.Values.events.argoCDServerServiceName -}} - {{ $argoCDServerServiceName = $eventReporterContext.Values.events.argoCDServerServiceName }} -{{- end -}} -{{- if $eventReporterContext.Values.events.argoCDServerServicePort -}} - {{ $argoCDServerServicePort = $eventReporterContext.Values.events.argoCDServerServicePort }} -{{- end -}} -{{- $_ := set $eventReporterContext.Values.events "argoCDServerServiceName" $argoCDServerServiceName }} -{{- $_ := set $eventReporterContext.Values.events "argoCDServerServicePort" $argoCDServerServicePort }} -{{- include "event-reporters.events-reporter.eventsource" $eventReporterContext }} \ No newline at end of file diff --git a/charts/gitops-runtime/templates/event-reporters/events-reporter/rbac.yaml b/charts/gitops-runtime/templates/event-reporters/events-reporter/rbac.yaml deleted file mode 100644 index af996235..00000000 --- a/charts/gitops-runtime/templates/event-reporters/events-reporter/rbac.yaml +++ /dev/null @@ -1,4 +0,0 @@ -{{- $eventReporterContext := deepCopy . }} -{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }} -{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }} -{{- include "event-reporters.events-reporter.rbac" $eventReporterContext }} \ No newline at end of file diff --git a/charts/gitops-runtime/templates/event-reporters/events-reporter/sensor.yaml b/charts/gitops-runtime/templates/event-reporters/events-reporter/sensor.yaml deleted file mode 100644 index 9a38ffbe..00000000 --- a/charts/gitops-runtime/templates/event-reporters/events-reporter/sensor.yaml +++ /dev/null @@ -1,4 +0,0 @@ -{{- $eventReporterContext := deepCopy . }} -{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }} -{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }} -{{- include "event-reporters.events-reporter.sensor" $eventReporterContext }} \ No newline at end of file diff --git a/charts/gitops-runtime/templates/event-reporters/events-reporter/serviceaccount.yaml b/charts/gitops-runtime/templates/event-reporters/events-reporter/serviceaccount.yaml deleted file mode 100644 index e1f49cf6..00000000 --- a/charts/gitops-runtime/templates/event-reporters/events-reporter/serviceaccount.yaml +++ /dev/null @@ -1,4 +0,0 @@ -{{- $eventReporterContext := deepCopy . }} -{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }} -{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }} -{{- include "event-reporters.events-reporter.sa" $eventReporterContext }} \ No newline at end of file diff --git a/charts/gitops-runtime/tests/argo-projects-templates-integration_test.yaml b/charts/gitops-runtime/tests/argo-projects-templates-integration_test.yaml index b4f7ec52..7b79c4fc 100644 --- a/charts/gitops-runtime/tests/argo-projects-templates-integration_test.yaml +++ b/charts/gitops-runtime/tests/argo-projects-templates-integration_test.yaml @@ -6,7 +6,6 @@ templates: - app-proxy/workflows-crb.yaml - app-proxy/config.yaml - internal-router/config.yaml - - event-reporters/events-reporter/eventsource.yaml - event-reporters/rollout-reporter/clusterrolebinding.yaml tests: # ------------------------------------------------------------------------ @@ -37,29 +36,6 @@ tests: path: data.argoCdUrl value: https://argo-cd-test-server:443 -- it: events reporter eventsource argocd url - http - template: 'event-reporters/events-reporter/eventsource.yaml' - values: - - ./values/mandatory-values.yaml - set: - argo-cd.fullnameOverride: argo-cd-test - argo-cd.configs.params.server\.insecure: true - asserts: - - equal: - path: spec.generic.events.url - value: argo-cd-test-server:80 - -- it: events reporter eventsource argocd url - http - template: 'event-reporters/events-reporter/eventsource.yaml' - values: - - ./values/mandatory-values.yaml - set: - argo-cd.fullnameOverride: argo-cd-test - argo-cd.configs.params.server\.insecure: false - asserts: - - equal: - path: spec.generic.events.url - value: argo-cd-test-server:443 # ------------------------------------------------------------------------------------------ # Argo Workflows # Affected templates: app-proxy ClusterRoleBinding to argo-server role, intenal-url config diff --git a/charts/gitops-runtime/tests/custom-ca_test.yaml b/charts/gitops-runtime/tests/custom-ca_test.yaml index ad474eee..6e8fb693 100644 --- a/charts/gitops-runtime/tests/custom-ca_test.yaml +++ b/charts/gitops-runtime/tests/custom-ca_test.yaml @@ -5,7 +5,6 @@ templates: - tls-custom-ca/workflow-pipelines-git-webhooks.yaml - app-proxy/deployment.yaml - event-reporters/workflow-reporter/sensor.yaml - - event-reporters/events-reporter/sensor.yaml - event-reporters/rollout-reporter/sensor.yaml - hooks/pre-uninstall/delete-runtime-from-platform.yaml - "gitops-operator.yaml" @@ -214,25 +213,6 @@ tests: name: SSL_CERT_FILE value: /app/config/codefresh-tls-certs/ca-bundle.crt -- it: events reporter sensor - check chart created secret with default key - template: event-reporters/events-reporter/sensor.yaml - values: - - ./values/mandatory-values.yaml - set: - global.codefresh.tls.caCerts.secret.annotations.test: 'test' - global.codefresh.tls.caCerts.secret.create: true - global.codefresh.tls.caCerts.secret.content: | - -----BEGIN CERTIFICATE----- - ... encoded certificate data here ... - -----END CERTIFICATE----- - asserts: - - equal: - path: spec.triggers[0].template.http.tls - value: - caCertSecret: - name: codefresh-tls-certs - key: ca-bundle.crt - - it: rollout reporter sensor - check chart created secret with default key template: event-reporters/rollout-reporter/sensor.yaml values: @@ -271,21 +251,6 @@ tests: name: codefresh-tls-certs key: ca-bundle.crt -- it: events reporter sensor - secretKeyRef - template: event-reporters/events-reporter/sensor.yaml - values: - - ./values/mandatory-values.yaml - set: - global.codefresh.tls.caCerts.secretKeyRef.name: my-secret - global.codefresh.tls.caCerts.secretKeyRef.key: my-key - asserts: - - equal: - path: spec.triggers[0].template.http.tls - value: - caCertSecret: - name: my-secret - key: my-key - - it: rollout reporter sensor - secretKeyRef template: event-reporters/rollout-reporter/sensor.yaml values: @@ -316,26 +281,6 @@ tests: name: my-secret key: my-key -- it: events reporter sensor - check chart created secret with custom key - template: event-reporters/events-reporter/sensor.yaml - values: - - ./values/mandatory-values.yaml - set: - global.codefresh.tls.caCerts.secret.annotations.test: 'test' - global.codefresh.tls.caCerts.secret.create: true - global.codefresh.tls.caCerts.secret.key: my-key - global.codefresh.tls.caCerts.secret.content: | - -----BEGIN CERTIFICATE----- - ... encoded certificate data here ... - -----END CERTIFICATE----- - asserts: - - equal: - path: spec.triggers[0].template.http.tls - value: - caCertSecret: - name: codefresh-tls-certs - key: my-key - - it: rollout reporter sensor - check chart created secret with custom key template: event-reporters/rollout-reporter/sensor.yaml values: @@ -376,14 +321,6 @@ tests: name: codefresh-tls-certs key: my-key -- it: events reporter sensor - no tls - template: event-reporters/events-reporter/sensor.yaml - values: - - ./values/mandatory-values.yaml - asserts: - - notExists: - path: spec.triggers[0].template.http.tls - - it: rollout reporter sensor - no tls template: event-reporters/rollout-reporter/sensor.yaml values: diff --git a/charts/gitops-runtime/tests/event-reporters-sensors_test.yaml b/charts/gitops-runtime/tests/event-reporters-sensors_test.yaml index b18992a2..340b5879 100644 --- a/charts/gitops-runtime/tests/event-reporters-sensors_test.yaml +++ b/charts/gitops-runtime/tests/event-reporters-sensors_test.yaml @@ -1,28 +1,8 @@ suite: Test on event reporters sensors templates: - event-reporters/workflow-reporter/sensor.yaml - - event-reporters/events-reporter/sensor.yaml - event-reporters/rollout-reporter/sensor.yaml tests: - - it: Setting api/events url works - events reporter - template: 'event-reporters/events-reporter/sensor.yaml' - values: - - './values/mandatory-values.yaml' - set: - global.codefresh.url: "https://my.platform" - global.codefresh.apiEventsPath: "/api-events" - event-reporters.events.sensor: - replicas: 1 - resources: {} - env: {} - tolerations: [] - nodeSelector: {} - affinity: {} - asserts: - - equal: - path: spec.triggers[0].template.http.url - value: https://my.platform/api-events - - it: Setting api/events url works - workflow reporter template: 'event-reporters/workflow-reporter/sensor.yaml' values: @@ -34,7 +14,7 @@ tests: - 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: @@ -52,61 +32,7 @@ tests: - equal: path: spec.triggers[2].template.http.url value: https://my.platform/api-events - - - it: Setting various container specs - events reporter - template: 'event-reporters/events-reporter/sensor.yaml' - values: - - './values/mandatory-values.yaml' - set: - event-reporters.events.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 - workflow reporter template: 'event-reporters/workflow-reporter/sensor.yaml' values: @@ -160,7 +86,7 @@ tests: value: region: east type: user-node - + - it: Setting various container specs - rollout reporter template: 'event-reporters/rollout-reporter/sensor.yaml' values: @@ -214,23 +140,7 @@ tests: value: region: east type: user-node - - - it: Logging without interval works - events reporter - template: 'event-reporters/events-reporter/sensor.yaml' - values: - - './values/mandatory-values.yaml' - set: - event-reporters.events.sensor: - logging: - enabled: true - asserts: - - contains: - path: spec.triggers - content: - template: - log: {} - name: log-trigger - + - it: Logging without interval works - workflow reporter template: 'event-reporters/workflow-reporter/sensor.yaml' values: @@ -246,7 +156,7 @@ tests: template: log: {} name: log-trigger - + - it: Logging without interval works - rollout reporter template: 'event-reporters/rollout-reporter/sensor.yaml' values: @@ -262,25 +172,7 @@ tests: template: log: {} name: log-trigger - - - it: Logging with interval works - events reporter - template: 'event-reporters/events-reporter/sensor.yaml' - values: - - './values/mandatory-values.yaml' - set: - event-reporters.events.sensor: - logging: - intervalSeconds: 60 - enabled: true - asserts: - - contains: - path: spec.triggers - content: - template: - log: - intervalSeconds: 60 - name: log-trigger - + - it: Logging with interval works - workflow reporter template: 'event-reporters/workflow-reporter/sensor.yaml' values: @@ -298,27 +190,7 @@ tests: log: intervalSeconds: 60 name: log-trigger - - - it: HTTP trigger contains retries if set - events reporter - template: 'event-reporters/events-reporter/sensor.yaml' - values: - - './values/mandatory-values.yaml' - set: - event-reporters.events.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 - workflow reporter template: 'event-reporters/workflow-reporter/sensor.yaml' values: @@ -338,7 +210,7 @@ tests: duration: 1 factor: 1.2 jitter: 3 - + - it: HTTP trigger contains retries if set - rollout reporter template: 'event-reporters/rollout-reporter/sensor.yaml' values: @@ -372,4 +244,4 @@ tests: duration: 1 factor: 1.2 jitter: 3 - + diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index 8e3c7e1d..bbf2468d 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -209,41 +209,6 @@ argo-rollouts: # Event reporters #----------------------------------------------------------------------------------------------------------------------- event-reporters: - events: - # -- LEAVE EMPTY and let the chart logic determine the name. Change only if you are totally sure you need to override ArgoCD service name. - argoCDServerServiceName: - # -- LEAVE EMPTY and let the chart logic determine the name. Change only if you are totally sure you need to override ArgoCD service port. - argoCDServerServicePort: - serviceAccount: - create: true - eventSource: - replicas: 1 - resources: {} - tolerations: [] - nodeSelector: {} - affinity: {} - sensor: - # -- Set to true to enable logging. Set intervalSeconds to add logging interval to moderate log flow. - logging: - enabled: false - intervalSeconds: 0 - # -- Retry strategy for events sent to Codefresh - retryStrategy: - # -- Number of retries - steps: 3 - # -- The initial duration, use strings like "2s", "1m" - duration: 0 - # -- Duration is multiplied by factor each retry, if factor is not zero and steps limit has not been reached. Should not be negative - factor: 1.0 - # -- The sleep between each retry is the duration plus an additional amount chosen uniformly at random from the interval between zero and `jitter * duration`. - jitter: 1 - replicas: 1 - resources: {} - # -- Environment variables for sensor pods - add DEBUG_LOG: "true" to add debug level logs - env: {} - tolerations: [] - nodeSelector: {} - affinity: {} rollout: serviceAccount: create: true