fix(argo-cd): Fix ingress extraHosts

Signed-off-by: Petr Drastil <petr.drastil@gmail.com>
This commit is contained in:
Petr Drastil 2024-02-08 09:59:02 +01:00
parent b8212e0b30
commit 035372e80b
No known key found for this signature in database
GPG key ID: B147517F4051E6ED
6 changed files with 28 additions and 36 deletions

View file

@ -3,7 +3,7 @@ appVersion: v2.10.0
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.0.0 version: 6.0.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,13 +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: removed - kind: fixed
description: Support for deprecated features description: Fixed rendering of ingress extraHosts sections
- 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`

View file

@ -28,25 +28,25 @@ spec:
{{- toYaml . | nindent 10 }} {{- toYaml . | nindent 10 }}
{{- end }} {{- end }}
- path: {{ .Values.applicationSet.ingress.path }} - path: {{ .Values.applicationSet.ingress.path }}
pathType: {{ $.Values.applicationSet.ingress.pathType }} 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 }}
backend: backend:
service: service:
name: {{ include "argo-cd.applicationSet.fullname" . }} name: {{ include "argo-cd.applicationSet.fullname" . }}
port: port:
number: {{ .Values.applicationSet.service.port }} number: {{ .Values.applicationSet.service.port }}
{{- end }} {{- 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 }} {{- with .Values.applicationSet.ingress.extraRules }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}

View file

@ -46,11 +46,11 @@ spec:
- host: {{ .name | quote }} - host: {{ .name | quote }}
http: http:
paths: paths:
- path: {{ default .Values.server.ingress.path .path }} - path: {{ default $.Values.server.ingress.path .path }}
pathType: {{ default .Values.server.ingress.pathType .pathType }} pathType: {{ default $.Values.server.ingress.pathType .pathType }}
backend: backend:
service: service:
name: {{ include "argo-cd.server.fullname" . }} name: {{ include "argo-cd.server.fullname" $ }}
port: port:
number: {{ $servicePort }} number: {{ $servicePort }}
{{- end }} {{- end }}

View file

@ -44,11 +44,11 @@ spec:
- host: {{ .name | quote }} - host: {{ .name | quote }}
http: http:
paths: paths:
- path: {{ default .Values.server.ingress.path .path }} - path: {{ default $.Values.server.ingress.path .path }}
pathType: {{ default .Values.server.ingress.pathType .pathType }} pathType: {{ default $.Values.server.ingress.pathType .pathType }}
backend: backend:
service: service:
name: {{ include "argo-cd.server.fullname" . }} name: {{ include "argo-cd.server.fullname" $ }}
port: port:
number: {{ $servicePort }} number: {{ $servicePort }}
{{- end }} {{- end }}

View file

@ -40,11 +40,11 @@ spec:
- host: {{ .name | quote }} - host: {{ .name | quote }}
http: http:
paths: paths:
- path: {{ default .Values.server.ingressGrpc.path .path }} - path: {{ default $.Values.server.ingressGrpc.path .path }}
pathType: {{ default .Values.server.ingressGrpc.pathType .pathType }} pathType: {{ default $.Values.server.ingressGrpc.pathType .pathType }}
backend: backend:
service: service:
name: {{ include "argo-cd.server.fullname" . }} name: {{ include "argo-cd.server.fullname" $ }}
port: port:
number: {{ $servicePort }} number: {{ $servicePort }}
{{- end }} {{- end }}

View file

@ -39,11 +39,11 @@ spec:
- host: {{ .name | quote }} - host: {{ .name | quote }}
http: http:
paths: paths:
- path: {{ default .Values.server.ingress.path .path }} - path: {{ default $.Values.server.ingress.path .path }}
pathType: {{ default .Values.server.ingress.pathType .pathType }} pathType: {{ default $.Values.server.ingress.pathType .pathType }}
backend: backend:
service: service:
name: {{ include "argo-cd.server.fullname" . }} name: {{ include "argo-cd.server.fullname" $ }}
port: port:
number: {{ $servicePort }} number: {{ $servicePort }}
{{- end }} {{- end }}