Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 11 commits into from
Jan 7, 2025
+10 −10
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7a6635d
Updated tpl function
gyajangi1 Dec 17, 2024
65ba262
Update ingress.yaml
gyajangi1 Dec 18, 2024
2e9cd98
reverted changes
gyajangi1 Dec 19, 2024
9162e96
Updated ingress.yaml
gyajangi1 Dec 20, 2024
aa28c70
Update charts/argo-cd/templates/argocd-server/ingress.yaml
gyajangi1 Dec 24, 2024
2079426
Update charts/argo-cd/templates/argocd-server/ingress.yaml
gyajangi1 Dec 24, 2024
b6c3d0e
update changelog for tpl function in ingress
gyajangi1 Jan 7, 2025
948c082
update changelog for tpl function in ingress
gyajangi1 Jan 7, 2025
ddbaef6
Update chart version 7.7.14
gyajangi1 Jan 7, 2025
00790e5
Update charts/argo-cd/Chart.yaml
gyajangi1 Jan 7, 2025
3d0ec16
fix: Drop trailing spaces
mkilchhofer Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions charts/argo-cd/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ appVersion: v2.13.3
kubeVersion: ">=1.25.0-0"
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 7.7.13
version: 7.7.14
home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
sources:
Expand All @@ -26,5 +26,5 @@ annotations:
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: |
- kind: changed
description: Bump argo-cd to v2.13.3
- kind: added
description: Added `tpl` function support for `server.ingress`.
14 changes: 7 additions & 7 deletions charts/argo-cd/templates/argocd-server/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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
Expand Down
Loading