diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 04559d2f..4a3d216f 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: v2.12.3-2024.12.17-4d75d35f4 +appVersion: v2.12.3-2024.12.23-4a8e092c0 kubeVersion: ">=1.23.0-0" description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 7.4.7-8-cap-2.12.3-2024.12.17-4d75d35f4 +version: 7.4.7-9-cap-2.12.3-2024.12.23-4a8e092c0 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png sources: @@ -27,4 +27,4 @@ annotations: url: https://argoproj.github.io/argo-helm/pgp_keys.asc artifacthub.io/changes: | - kind: changed - description: argo-cd updated to v2.12.3-2024.12.17-4d75d35f4 with fix for remove changeRevision changeRevisions fields from protobuf for compatibility with OSS cli + description: argo-cd updated to v2.12.3-2024.12.23-4a8e092c0 using sources-server for application version diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 1ced59c4..229c989e 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -784,6 +784,8 @@ NAME: my-release | eventReporter.serviceAccount.create | bool | `true` | Create a service account for the event reporter | | eventReporter.serviceAccount.labels | object | `{}` | Labels applied to created service account | | eventReporter.serviceAccount.name | string | `"event-reporter"` | Service account name | +| eventReporter.sourcesServer.baseURL | string | `"http://sources-server"` | base URL of sources-server | +| eventReporter.sourcesServer.enabled | bool | `false` | Use sources-server logic instead of repo-server | | eventReporter.statefulsetAnnotations | object | `{}` | Annotations for the event reporter StatefulSet | | eventReporter.terminationGracePeriodSeconds | int | `30` | terminationGracePeriodSeconds for container lifecycle hook | | eventReporter.tolerations | list | `[]` (defaults to global.tolerations) | [Tolerations] for use with node taints | diff --git a/charts/argo-cd/templates/event-reporter/statefulset.yaml b/charts/argo-cd/templates/event-reporter/statefulset.yaml index e9e8ad37..55581e19 100644 --- a/charts/argo-cd/templates/event-reporter/statefulset.yaml +++ b/charts/argo-cd/templates/event-reporter/statefulset.yaml @@ -70,6 +70,10 @@ spec: {{- with (concat .Values.global.env .Values.eventReporter.env) }} {{- toYaml . | nindent 10 }} {{- end }} + - name: SOURCES_SERVER_ENABLED + value: {{ .Values.eventReporter.sourcesServer.enabled | quote }} + - name: SOURCES_SERVER_BASE_URL + value: {{ .Values.eventReporter.sourcesServer.baseURL | quote }} - name: EVENT_REPORTER_APPLICATION_SERVER value: {{ include "argo-cd.eventReporter.argocd-server-adress" . }} - name: EVENT_REPORTER_REPLICAS diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index d054c574..977b4359 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -3843,6 +3843,13 @@ eventReporter: # topologyKey: topology.kubernetes.io/zone # whenUnsatisfiable: DoNotSchedule + # Configuration of sources-server using + sourcesServer: + # -- Use sources-server logic instead of repo-server + enabled: false + # -- base URL of sources-server + baseURL: "http://sources-server" + serviceAccount: # -- Create a service account for the event reporter create: true