fix(argo-cd): Fix ingress extraHosts (#2479)
Signed-off-by: Petr Drastil <petr.drastil@gmail.com>pull/2481/head argo-cd-6.0.1
Petr Drastil
GitHub
parent
b8212e0b30
commit
e785763b59
|
|
@ -3,7 +3,7 @@ appVersion: v2.10.0
|
|||
kubeVersion: ">=1.23.0-0"
|
||||
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
|
||||
name: argo-cd
|
||||
version: 6.0.0
|
||||
version: 6.0.1
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
|
||||
sources:
|
||||
|
|
@ -26,13 +26,5 @@ annotations:
|
|||
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
|
||||
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
|
||||
artifacthub.io/changes: |
|
||||
- kind: removed
|
||||
description: Support for deprecated features
|
||||
- kind: removed
|
||||
description: Wildcard catch all ingress rule
|
||||
- kind: added
|
||||
description: Ingress extra rules to allow custom ingress custom rules
|
||||
- kind: added
|
||||
description: Dedicated ingress implementation for AWS and GKE Application Load Balancers
|
||||
- kind: changed
|
||||
description: Support for multiple ingress hosts and paths refactored into `extraHosts` and `extraPaths`
|
||||
- kind: fixed
|
||||
description: Fixed rendering of ingress extraHosts sections
|
||||
|
|
|
|||
|
|
@ -28,25 +28,25 @@ spec:
|
|||
{{- toYaml . | nindent 10 }}
|
||||
{{- end }}
|
||||
- path: {{ .Values.applicationSet.ingress.path }}
|
||||
pathType: {{ $.Values.applicationSet.ingress.pathType }}
|
||||
backend:
|
||||
service:
|
||||
name: {{ include "argo-cd.applicationSet.fullname" $ }}
|
||||
port:
|
||||
number: {{ .Values.applicationSet.service.port }}
|
||||
{{- end }}
|
||||
{{- range .Values.server.ingress.extraHosts }}
|
||||
- host: {{ .name | quote }}
|
||||
http:
|
||||
paths:
|
||||
- path: {{ default .Values.server.ingress.path .path }}
|
||||
pathType: {{ default .Values.server.ingress.pathType .pathType }}
|
||||
pathType: {{ .Values.applicationSet.ingress.pathType }}
|
||||
backend:
|
||||
service:
|
||||
name: {{ include "argo-cd.applicationSet.fullname" . }}
|
||||
port:
|
||||
number: {{ .Values.applicationSet.service.port }}
|
||||
{{- end }}
|
||||
{{- range .Values.applicationSet.ingress.extraHosts }}
|
||||
- host: {{ .name | quote }}
|
||||
http:
|
||||
paths:
|
||||
- path: {{ default $.Values.applicationSet.ingress.path .path }}
|
||||
pathType: {{ default $.Values.applicationSet.ingress.pathType .pathType }}
|
||||
backend:
|
||||
service:
|
||||
name: {{ include "argo-cd.applicationSet.fullname" $ }}
|
||||
port:
|
||||
number: {{ $.Values.applicationSet.service.port }}
|
||||
{{- end }}
|
||||
{{- with .Values.applicationSet.ingress.extraRules }}
|
||||
{{- toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -46,11 +46,11 @@ spec:
|
|||
- host: {{ .name | quote }}
|
||||
http:
|
||||
paths:
|
||||
- path: {{ default .Values.server.ingress.path .path }}
|
||||
pathType: {{ default .Values.server.ingress.pathType .pathType }}
|
||||
- path: {{ default $.Values.server.ingress.path .path }}
|
||||
pathType: {{ default $.Values.server.ingress.pathType .pathType }}
|
||||
backend:
|
||||
service:
|
||||
name: {{ include "argo-cd.server.fullname" . }}
|
||||
name: {{ include "argo-cd.server.fullname" $ }}
|
||||
port:
|
||||
number: {{ $servicePort }}
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -44,11 +44,11 @@ spec:
|
|||
- host: {{ .name | quote }}
|
||||
http:
|
||||
paths:
|
||||
- path: {{ default .Values.server.ingress.path .path }}
|
||||
pathType: {{ default .Values.server.ingress.pathType .pathType }}
|
||||
- path: {{ default $.Values.server.ingress.path .path }}
|
||||
pathType: {{ default $.Values.server.ingress.pathType .pathType }}
|
||||
backend:
|
||||
service:
|
||||
name: {{ include "argo-cd.server.fullname" . }}
|
||||
name: {{ include "argo-cd.server.fullname" $ }}
|
||||
port:
|
||||
number: {{ $servicePort }}
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -40,11 +40,11 @@ spec:
|
|||
- host: {{ .name | quote }}
|
||||
http:
|
||||
paths:
|
||||
- path: {{ default .Values.server.ingressGrpc.path .path }}
|
||||
pathType: {{ default .Values.server.ingressGrpc.pathType .pathType }}
|
||||
- path: {{ default $.Values.server.ingressGrpc.path .path }}
|
||||
pathType: {{ default $.Values.server.ingressGrpc.pathType .pathType }}
|
||||
backend:
|
||||
service:
|
||||
name: {{ include "argo-cd.server.fullname" . }}
|
||||
name: {{ include "argo-cd.server.fullname" $ }}
|
||||
port:
|
||||
number: {{ $servicePort }}
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -39,11 +39,11 @@ spec:
|
|||
- host: {{ .name | quote }}
|
||||
http:
|
||||
paths:
|
||||
- path: {{ default .Values.server.ingress.path .path }}
|
||||
pathType: {{ default .Values.server.ingress.pathType .pathType }}
|
||||
- path: {{ default $.Values.server.ingress.path .path }}
|
||||
pathType: {{ default $.Values.server.ingress.pathType .pathType }}
|
||||
backend:
|
||||
service:
|
||||
name: {{ include "argo-cd.server.fullname" . }}
|
||||
name: {{ include "argo-cd.server.fullname" $ }}
|
||||
port:
|
||||
number: {{ $servicePort }}
|
||||
{{- end }}
|
||||
|
|
|
|||
Loading…
Reference in New Issue