fix(argo-cd): Add missing global.domain
default values (#2525)
Signed-off-by: Laurent Lavaud <llavaud@lvdconsulting.pro>
This commit is contained in:
parent
1808903a6b
commit
aa69a77691
7 changed files with 11 additions and 11 deletions
|
@ -3,7 +3,7 @@ appVersion: v2.10.1
|
||||||
kubeVersion: ">=1.23.0-0"
|
kubeVersion: ">=1.23.0-0"
|
||||||
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
|
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
|
||||||
name: argo-cd
|
name: argo-cd
|
||||||
version: 6.2.0
|
version: 6.2.1
|
||||||
home: https://github.com/argoproj/argo-helm
|
home: https://github.com/argoproj/argo-helm
|
||||||
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
|
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
|
||||||
sources:
|
sources:
|
||||||
|
@ -26,5 +26,5 @@ annotations:
|
||||||
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
|
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
|
||||||
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
|
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
|
||||||
artifacthub.io/changes: |
|
artifacthub.io/changes: |
|
||||||
- kind: changed
|
- kind: fixed
|
||||||
description: bumped redis chart and redis exporter
|
description: Add missing `global.domain` default values
|
||||||
|
|
|
@ -52,7 +52,7 @@ spec:
|
||||||
tls:
|
tls:
|
||||||
{{- if .Values.applicationSet.ingress.tls }}
|
{{- if .Values.applicationSet.ingress.tls }}
|
||||||
- hosts:
|
- hosts:
|
||||||
- {{ .Values.applicationSet.ingress.hostname }}
|
- {{ .Values.applicationSet.ingress.hostname | default .Values.global.domain }}
|
||||||
secretName: argocd-applicationset-controller-tls
|
secretName: argocd-applicationset-controller-tls
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- with .Values.applicationSet.ingress.extraTls }}
|
{{- with .Values.applicationSet.ingress.extraTls }}
|
||||||
|
|
|
@ -22,7 +22,7 @@ spec:
|
||||||
ingressClassName: {{ . }}
|
ingressClassName: {{ . }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
rules:
|
rules:
|
||||||
- host: {{ .Values.server.ingress.hostname }}
|
- host: {{ .Values.server.ingress.hostname | default .Values.global.domain }}
|
||||||
http:
|
http:
|
||||||
paths:
|
paths:
|
||||||
{{- with .Values.server.ingress.extraPaths }}
|
{{- with .Values.server.ingress.extraPaths }}
|
||||||
|
@ -61,7 +61,7 @@ spec:
|
||||||
tls:
|
tls:
|
||||||
{{- if .Values.server.ingress.tls }}
|
{{- if .Values.server.ingress.tls }}
|
||||||
- hosts:
|
- hosts:
|
||||||
- {{ .Values.server.ingress.hostname }}
|
- {{ .Values.server.ingress.hostname | default .Values.global.domain }}
|
||||||
secretName: argocd-server-tls
|
secretName: argocd-server-tls
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- with .Values.server.ingress.extraTls }}
|
{{- with .Values.server.ingress.extraTls }}
|
||||||
|
|
|
@ -27,7 +27,7 @@ spec:
|
||||||
ingressClassName: {{ . }}
|
ingressClassName: {{ . }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
rules:
|
rules:
|
||||||
- host: {{ .Values.server.ingress.hostname }}
|
- host: {{ .Values.server.ingress.hostname | default .Values.global.domain }}
|
||||||
http:
|
http:
|
||||||
paths:
|
paths:
|
||||||
{{- with .Values.server.ingress.extraPaths }}
|
{{- with .Values.server.ingress.extraPaths }}
|
||||||
|
@ -59,7 +59,7 @@ spec:
|
||||||
tls:
|
tls:
|
||||||
{{- if .Values.server.ingress.tls }}
|
{{- if .Values.server.ingress.tls }}
|
||||||
- hosts:
|
- hosts:
|
||||||
- {{ .Values.server.ingress.hostname }}
|
- {{ .Values.server.ingress.hostname | default .Values.global.domain }}
|
||||||
secretName: argocd-server-tls
|
secretName: argocd-server-tls
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- with .Values.server.ingress.extraTls }}
|
{{- with .Values.server.ingress.extraTls }}
|
||||||
|
|
|
@ -8,7 +8,7 @@ metadata:
|
||||||
{{- 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 }}
|
||||||
spec:
|
spec:
|
||||||
domains:
|
domains:
|
||||||
- {{ .Values.server.ingress.hostname }}
|
- {{ .Values.server.ingress.hostname | default .Values.global.domain }}
|
||||||
{{- with .Values.server.ingress.gke.managedCertificate.extraDomains }}
|
{{- with .Values.server.ingress.gke.managedCertificate.extraDomains }}
|
||||||
{{- toYaml . | nindent 4 }}
|
{{- toYaml . | nindent 4 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
|
@ -54,7 +54,7 @@ spec:
|
||||||
tls:
|
tls:
|
||||||
{{- if .Values.server.ingress.tls }}
|
{{- if .Values.server.ingress.tls }}
|
||||||
- hosts:
|
- hosts:
|
||||||
- {{ .Values.server.ingress.hostname }}
|
- {{ .Values.server.ingress.hostname | default .Values.global.domain }}
|
||||||
{{- range .Values.server.ingress.extraHosts }}
|
{{- range .Values.server.ingress.extraHosts }}
|
||||||
{{- if .name }}
|
{{- if .name }}
|
||||||
- {{ .name }}
|
- {{ .name }}
|
||||||
|
|
|
@ -13,7 +13,7 @@ metadata:
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
spec:
|
spec:
|
||||||
host: {{ .Values.server.route.hostname | quote }}
|
host: {{ .Values.server.route.hostname | default .Values.global.domain | quote }}
|
||||||
to:
|
to:
|
||||||
kind: Service
|
kind: Service
|
||||||
name: {{ template "argo-cd.server.fullname" . }}
|
name: {{ template "argo-cd.server.fullname" . }}
|
||||||
|
|
Loading…
Reference in a new issue