Skip to content

Commit 9946d3d

Browse files
feat(argo-cd): Add DRY support for Ingress (#3081)
* Updated tpl function Signed-off-by: gyajangi1 <[email protected]> * Update ingress.yaml Signed-off-by: gyajangi1 <[email protected]> * reverted changes Signed-off-by: gyajangi1 <[email protected]> * Updated ingress.yaml Signed-off-by: gyajangi1 <[email protected]> * Update charts/argo-cd/templates/argocd-server/ingress.yaml Co-authored-by: Marco Maurer (-Kilchhofer) <[email protected]> Signed-off-by: gyajangi1 <[email protected]> * Update charts/argo-cd/templates/argocd-server/ingress.yaml Co-authored-by: Marco Maurer (-Kilchhofer) <[email protected]> Signed-off-by: gyajangi1 <[email protected]> * update changelog for tpl function in ingress Signed-off-by: gyajangi1 <[email protected]> * update changelog for tpl function in ingress Signed-off-by: gyajangi1 <[email protected]> * Update chart version 7.7.14 Signed-off-by: gyajangi1 <[email protected]> * Update charts/argo-cd/Chart.yaml Co-authored-by: Marco Maurer (-Kilchhofer) <[email protected]> Signed-off-by: gyajangi1 <[email protected]> * fix: Drop trailing spaces Signed-off-by: Marco Maurer (-Kilchhofer) <[email protected]> --------- Signed-off-by: gyajangi1 <[email protected]> Signed-off-by: Marco Maurer (-Kilchhofer) <[email protected]> Co-authored-by: Marco Maurer (-Kilchhofer) <[email protected]>
1 parent 796f6c8 commit 9946d3d

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

charts/argo-cd/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ appVersion: v2.13.3
33
kubeVersion: ">=1.25.0-0"
44
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
55
name: argo-cd
6-
version: 7.7.13
6+
version: 7.7.14
77
home: https://github.com/argoproj/argo-helm
88
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
99
sources:
@@ -26,5 +26,5 @@ annotations:
2626
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
2727
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
2828
artifacthub.io/changes: |
29-
- kind: changed
30-
description: Bump argo-cd to v2.13.3
29+
- kind: added
30+
description: Added `tpl` function support for `server.ingress`.

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ metadata:
99
labels:
1010
{{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
1111
{{- with .Values.server.ingress.labels }}
12-
{{- toYaml . | nindent 4 }}
12+
{{- tpl (toYaml .) $ | nindent 4 }}
1313
{{- end }}
1414
{{- with .Values.server.ingress.annotations }}
1515
annotations:
1616
{{- range $key, $value := . }}
17-
{{ $key }}: {{ $value | quote }}
17+
{{ $key }}: {{ tpl $value $ | quote }}
1818
{{- end }}
1919
{{- end }}
2020
spec:
2121
{{- with .Values.server.ingress.ingressClassName }}
22-
ingressClassName: {{ . }}
22+
ingressClassName: {{ tpl . $ }}
2323
{{- end }}
2424
rules:
25-
- host: {{ .Values.server.ingress.hostname | default .Values.global.domain }}
25+
- host: {{ tpl (.Values.server.ingress.hostname) $ | default .Values.global.domain }}
2626
http:
2727
paths:
2828
{{- with .Values.server.ingress.extraPaths }}
@@ -36,7 +36,7 @@ spec:
3636
port:
3737
number: {{ $servicePort }}
3838
{{- range .Values.server.ingress.extraHosts }}
39-
- host: {{ .name | quote }}
39+
- host: {{ tpl .name $ | quote }}
4040
http:
4141
paths:
4242
- path: {{ default $.Values.server.ingress.path .path }}
@@ -54,10 +54,10 @@ spec:
5454
tls:
5555
{{- if .Values.server.ingress.tls }}
5656
- hosts:
57-
- {{ .Values.server.ingress.hostname | default .Values.global.domain }}
57+
- {{ tpl (.Values.server.ingress.hostname) $ | default .Values.global.domain }}
5858
{{- range .Values.server.ingress.extraHosts }}
5959
{{- if .name }}
60-
- {{ .name }}
60+
- {{ tpl .name $ }}
6161
{{- end }}
6262
{{- end }}
6363
secretName: argocd-server-tls

0 commit comments

Comments
 (0)