Updated tpl function

Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>
This commit is contained in:
gyajangi1 2024-12-17 13:53:59 +05:30
parent 796f6c8dc3
commit 7a6635d973

View file

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