DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #92 from codefresh-io/fix/argocd-event-reporter-non-default-url

Browse source
This commit is contained in:
ilia-medvedev-codefresh 2024-08-10 15:12:02 +03:00 committed by GitHub
commit 8e6ffa5db3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charts/argo-cd/Chart.yaml
View file

@ -3,7 +3,7 @@ appVersion: v2.11-2024.7.30-a31bf96bb
kubeVersion: ">=1.23.0-0" kubeVersion: ">=1.23.0-0"
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 6.11.1-5-cap-2.11-2024.7.30-a31bf96bb version: 6.11.1-6-cap-2.11-2024.7.30-a31bf96bb
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
sources: sources:

11
charts/argo-cd/templates/_helpers.tpl
View file

@ -262,3 +262,14 @@ Create the name of the Argo CD server service account to use
{{ default "default" .Values.eventReporter.serviceAccount.name }} {{ default "default" .Values.eventReporter.serviceAccount.name }}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{/*
Helper template to set argocd server url in event reporter
*/}}
{{- define "argo-cd.eventReporter.argocd-server-adress" -}}
{{- $port := .Values.server.service.servicePortHttps }}
{{- if (index .Values.configs.params "server.insecure") }}
{{- $port = .Values.server.service.servicePortHttp }}
{{- end }}
{{- printf "%s:%v" (include "argo-cd.server.fullname" .) $port }}
{{- end -}}

2
charts/argo-cd/templates/event-reporter/statefulset.yaml
View file

@ -71,6 +71,8 @@ spec:
{{- with (concat .Values.global.env .Values.eventReporter.env) }} {{- with (concat .Values.global.env .Values.eventReporter.env) }}
{{- toYaml . | nindent 10 }} {{- toYaml . | nindent 10 }}
{{- end }} {{- end }}
- name: EVENT_REPORTER_APPLICATION_SERVER
value: {{ include "argo-cd.eventReporter.argocd-server-adress" . }}
- name: EVENT_REPORTER_REPLICAS - name: EVENT_REPORTER_REPLICAS
value: {{ .Values.eventReporter.replicas | quote }} value: {{ .Values.eventReporter.replicas | quote }}
- name: ARGOCD_APPLICATION_NAMESPACES - name: ARGOCD_APPLICATION_NAMESPACES