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

feat(argo-cd): Add DRY support for Ingress (#3081)

Browse source 
* Updated tpl function

Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>

* Update ingress.yaml

Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>

* reverted changes

Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>

* Updated ingress.yaml

Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>

* Update charts/argo-cd/templates/argocd-server/ingress.yaml

Co-authored-by: Marco Maurer (-Kilchhofer) <mkilchhofer@users.noreply.github.com>
Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>

* Update charts/argo-cd/templates/argocd-server/ingress.yaml

Co-authored-by: Marco Maurer (-Kilchhofer) <mkilchhofer@users.noreply.github.com>
Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>

* update changelog for tpl function in ingress

Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>

* update changelog for tpl function in ingress

Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>

* Update chart version 7.7.14

Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>

* Update charts/argo-cd/Chart.yaml

Co-authored-by: Marco Maurer (-Kilchhofer) <mkilchhofer@users.noreply.github.com>
Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>

* fix: Drop trailing spaces

Signed-off-by: Marco Maurer (-Kilchhofer) <mkilchhofer@users.noreply.github.com>

---------

Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>
Signed-off-by: Marco Maurer (-Kilchhofer) <mkilchhofer@users.noreply.github.com>
Co-authored-by: Marco Maurer (-Kilchhofer) <mkilchhofer@users.noreply.github.com>
This commit is contained in:
gyajangi1 2025-01-07 17:32:31 +05:30 • committed by GitHub
parent 796f6c8dc3
commit 9946d3dfee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
charts/argo-cd/templates/argocd-server/ingress.yaml
View file

@ -9,20 +9,20 @@ metadata:
labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
{{- with .Values.server.ingress.labels }}
{{- toYaml . | nindent 4 }}
{{- tpl (toYaml .) $ | nindent 4 }}
{{- end }}
{{- with .Values.server.ingress.annotations }}
annotations:
{{- range $key, $value := . }}
{{ $key }}: {{ $value | quote }}
{{ $key }}: {{ tpl $value $ | quote }}
{{- end }}
{{- end }}
spec:
{{- with .Values.server.ingress.ingressClassName }}
ingressClassName: {{ . }}
ingressClassName: {{ tpl . $ }}
{{- end }}
rules:
- host: {{ .Values.server.ingress.hostname | default .Values.global.domain }}
- host: {{ tpl (.Values.server.ingress.hostname) $ | default .Values.global.domain }}
http:
paths:
{{- with .Values.server.ingress.extraPaths }}
@ -36,7 +36,7 @@ spec:
port:
number: {{ $servicePort }}
{{- range .Values.server.ingress.extraHosts }}
- host: {{ .name | quote }}
- host: {{ tpl .name $ | quote }}
http:
paths:
- path: {{ default $.Values.server.ingress.path .path }}
@ -54,10 +54,10 @@ spec:
tls:
{{- if .Values.server.ingress.tls }}
- hosts:
- {{ .Values.server.ingress.hostname | default .Values.global.domain }}
- {{ tpl (.Values.server.ingress.hostname) $ | default .Values.global.domain }}
{{- range .Values.server.ingress.extraHosts }}
{{- if .name }}
- {{ .name }}
- {{ tpl .name $ }}
{{- end }}
{{- end }}
secretName: argocd-server-tls