DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(argo-cd): Fix path order in AWS Ingress declaration (#2531)

Browse source 
* fix(ingress-aws): Fix path order in AWS Ingress declaration

Fix path order to evaluate GRPc endpoint first

Signed-off-by: fulcrum29 <35672150+fulcrum29@users.noreply.github.com>

* chore: update Chart version

Signed-off-by: fulcrum29 <35672150+fulcrum29@users.noreply.github.com>

* chore: add aritfacthub description

Signed-off-by: fulcrum29 <35672150+fulcrum29@users.noreply.github.com>

---------

Signed-off-by: fulcrum29 <35672150+fulcrum29@users.noreply.github.com>
This commit is contained in:
fulcrum29 2024-02-20 12:38:50 +01:00 committed by GitHub
parent aa69a77691
commit f198eecc23
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
charts/argo-cd/Chart.yaml
View file

@ -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.1 version: 6.2.2
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:
@ -27,4 +27,4 @@ annotations:
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: fixed - kind: fixed
description: Add missing `global.domain` default values description: AWS gRPC Ingress rule ordering

14
charts/argo-cd/templates/argocd-server/aws/ingress.yaml
View file

@ -28,13 +28,6 @@ spec:
{{- with .Values.server.ingress.extraPaths }} {{- with .Values.server.ingress.extraPaths }}
{{- toYaml . | nindent 10 }} {{- toYaml . | nindent 10 }}
{{- end }} {{- end }}
- path: {{ .Values.server.ingress.path }}
pathType: {{ $.Values.server.ingress.pathType }}
backend:
service:
name: {{ include "argo-cd.server.fullname" . }}
port:
number: {{ $servicePort }}
- path: {{ .Values.server.ingress.path }} - path: {{ .Values.server.ingress.path }}
pathType: {{ $.Values.server.ingressGrpc.pathType }} pathType: {{ $.Values.server.ingressGrpc.pathType }}
backend: backend:
@ -42,6 +35,13 @@ spec:
name: {{ include "argo-cd.server.fullname" $ }}-grpc name: {{ include "argo-cd.server.fullname" $ }}-grpc
port: port:
number: {{ $servicePort }} number: {{ $servicePort }}
- path: {{ .Values.server.ingress.path }}
pathType: {{ $.Values.server.ingress.pathType }}
backend:
service:
name: {{ include "argo-cd.server.fullname" . }}
port:
number: {{ $servicePort }}
{{- range .Values.server.ingress.extraHosts }} {{- range .Values.server.ingress.extraHosts }}
- host: {{ .name | quote }} - host: {{ .name | quote }}
http: http: