Skip to content

Commit 1310051

Browse files
committed
fix(argo-cd): support empty matches in GRPCRoute rules
Signed-off-by: Eric Bailey <eric@ericb.me>
1 parent 221f4d5 commit 1310051

File tree

3 files changed

+18
-13
lines changed

3 files changed

+18
-13
lines changed

charts/argo-cd/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ appVersion: v3.2.0
33
kubeVersion: ">=1.25.0-0"
44
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
55
name: argo-cd
6-
version: 9.1.4
6+
version: 9.1.5
77
home: https://github.com/argoproj/argo-helm
88
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
99
sources:
@@ -26,5 +26,5 @@ annotations:
2626
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
2727
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
2828
artifacthub.io/changes: |
29-
- kind: changed
30-
description: Bump redis_exporter to v1.80.1
29+
- kind: fixed
30+
description: Support empty matches in GRPCRoute rules
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
server:
2+
grpcroute:
3+
enabled: true
4+
rules:
5+
- matches: []

charts/argo-cd/templates/argocd-server/grpcroute.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ spec:
2626
{{- toYaml . | nindent 4 }}
2727
{{- end }}
2828
rules:
29-
{{- range .Values.server.grpcroute.rules }}
30-
{{- with .matches }}
31-
- matches:
32-
{{- toYaml . | nindent 8 }}
33-
{{- end }}
34-
{{- with .filters }}
35-
filters:
36-
{{- toYaml . | nindent 8 }}
37-
{{- end }}
38-
backendRefs:
29+
{{- range .Values.server.grpcroute.rules }}
30+
- backendRefs:
3931
- name: {{ $fullName }}
4032
port: {{ $servicePort }}
4133
weight: 1
34+
{{- with .filters }}
35+
filters:
36+
{{- toYaml . | nindent 8 }}
4237
{{- end }}
38+
{{- with .matches }}
39+
matches:
40+
{{- toYaml . | nindent 8 }}
41+
{{- end }}
42+
{{- end }}
4343
{{- end }}

0 commit comments

Comments
 (0)