feat(argo-cd): Add DRY support for Ingress (#3081)
* 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>pull/3111/head argo-cd-7.7.14
parent
796f6c8dc3
commit
9946d3dfee
|
@ -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:
|
||||
|
@ -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`.
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue