Skip to content

Commit 8d55fa7

Browse files
committed
Update HTTPRoutes and RuleSets with missing fields
ArgoCD sees the HTTPRoute and RuleSet resources being out of sync as the templates are missing some default fields. Issue: LFXV2-511 Signed-off-by: Trevor Bramwell <[email protected]>
1 parent 46e19d7 commit 8d55fa7

File tree

7 files changed

+47
-12
lines changed

7 files changed

+47
-12
lines changed

charts/lfx-platform/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: v2
55
name: lfx-platform
66
description: LFX Platform v2 Helm chart
77
type: application
8-
version: 0.2.21
8+
version: 0.2.22
99
icon: https://github.com/linuxfoundation/lfx-v2-helm/raw/main/img/lfx-logo-color.svg
1010
dependencies:
1111
- name: traefik

charts/lfx-platform/templates/mailpit/httproute.yaml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,30 @@ metadata:
1111
spec:
1212
parentRefs:
1313
{{- if .Values.gateway.enabled }}
14-
- name: {{ .Values.gateway.name | default "lfx-platform-gateway" }}
14+
- group: gateway.networking.k8s.io
15+
kind: Gateway
16+
name: {{ .Values.gateway.name | default "lfx-platform-gateway" }}
1517
sectionName: {{ include "lfx-platform.default-listener" . }}
1618
namespace: {{ .Release.Namespace }}
1719
{{- else }}
18-
- name: {{ .Values.lfx.parentGateway.name }}
20+
- group: gateway.networking.k8s.io
21+
kind: Gateway
22+
name: {{ .Values.lfx.parentGateway.name }}
1923
sectionName: {{ .Values.lfx.parentGateway.sectionName }}
2024
namespace: {{ .Values.lfx.parentGateway.namespace }}
2125
{{- end }}
2226
hostnames:
2327
- 'mailpit.{{ .Values.lfx.domain }}'
2428
rules:
2529
- backendRefs:
26-
- name: {{ include "common.names.fullname" .Subcharts.mailpit }}-http
30+
- group: ""
31+
kind: Service
32+
name: {{ include "common.names.fullname" .Subcharts.mailpit }}-http
2733
namespace: {{ .Release.Namespace }}
2834
port: {{ .Values.mailpit.service.http.port }}
35+
weight: 1
36+
matches:
37+
- path:
38+
type: PathPrefix
39+
value: /
2940
{{- end }}

charts/lfx-platform/templates/mailpit/https-redirect-httproute.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,15 @@ metadata:
1111
spec:
1212
parentRefs:
1313
{{- if .Values.gateway.enabled }}
14-
- name: {{ .Values.gateway.name | default "lfx-platform-gateway" }}
14+
- group: gateway.networking.k8s.io
15+
kind: Gateway
16+
name: {{ .Values.gateway.name | default "lfx-platform-gateway" }}
1517
sectionName: {{ include "lfx-platform.http-listener" . }}
1618
namespace: {{ .Release.Namespace }}
1719
{{- else }}
18-
- name: {{ .Values.lfx.parentGateway.name }}
20+
- group: gateway.networking.k8s.io
21+
kind: Gateway
22+
name: {{ .Values.lfx.parentGateway.name }}
1923
sectionName: {{ .Values.lfx.parentGateway.sectionName }}
2024
namespace: {{ .Values.lfx.parentGateway.namespace }}
2125
{{- end }}
@@ -27,4 +31,8 @@ spec:
2731
requestRedirect:
2832
scheme: https
2933
statusCode: 301
34+
matches:
35+
- path:
36+
type: PathPrefix
37+
value: /
3038
{{- end }}

charts/lfx-platform/templates/swagger_ui/httproute.yaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@ metadata:
1010
spec:
1111
parentRefs:
1212
{{- if .Values.gateway.enabled }}
13-
- name: {{ .Values.gateway.name | default "lfx-platform-gateway" }}
13+
- group: gateway.networking.k8s.io
14+
kind: Gateway
15+
name: {{ .Values.gateway.name | default "lfx-platform-gateway" }}
1416
sectionName: {{ include "lfx-platform.default-listener" . }}
1517
namespace: {{ .Release.Namespace }}
1618
{{- else }}
17-
- name: {{ .Values.lfx.parentGateway.name }}
19+
- group: gateway.networking.k8s.io
20+
kind: Gateway
21+
name: {{ .Values.lfx.parentGateway.name }}
1822
sectionName: {{ .Values.lfx.parentGateway.sectionName }}
1923
namespace: {{ .Values.lfx.parentGateway.namespace }}
2024
{{- end }}
@@ -39,6 +43,9 @@ spec:
3943
type: ReplacePrefixMatch
4044
replacePrefixMatch: /
4145
backendRefs:
42-
- name: swagger-ui
46+
- group: ""
47+
kind: Service
48+
name: swagger-ui
4349
port: 80
50+
weight: 1
4451
{{- end }}

charts/lfx-platform/templates/swagger_ui/ruleset.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ metadata:
1010
spec:
1111
rules:
1212
- id: "rule:lfx:swagger_ui:public"
13+
allow_encoded_slashes: "off"
1314
match:
1415
methods:
1516
- GET

charts/lfx-platform/templates/whoami/httproute.yaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,15 @@ metadata:
1111
spec:
1212
parentRefs:
1313
{{- if .Values.gateway.enabled }}
14-
- name: {{ .Values.gateway.name | default "lfx-platform-gateway" }}
14+
- group: gateway.networking.k8s.io
15+
kind: Gateway
16+
name: {{ .Values.gateway.name | default "lfx-platform-gateway" }}
1517
sectionName: {{ include "lfx-platform.default-listener" . }}
1618
namespace: {{ .Release.Namespace }}
1719
{{- else }}
18-
- name: {{ .Values.lfx.parentGateway.name }}
20+
- group: gateway.networking.k8s.io
21+
kind: Gateway
22+
name: {{ .Values.lfx.parentGateway.name }}
1923
sectionName: {{ .Values.lfx.parentGateway.sectionName }}
2024
namespace: {{ .Values.lfx.parentGateway.namespace }}
2125
{{- end }}
@@ -36,6 +40,9 @@ spec:
3640
name: heimdall
3741
{{- end }}
3842
backendRefs:
39-
- name: whoami
43+
- group: ""
44+
kind: Service
45+
name: whoami
4046
port: 80
47+
weight: 1
4148
{{- end }}

charts/lfx-platform/templates/whoami/ruleset.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ metadata:
1010
spec:
1111
rules:
1212
- id: "rule:lfx:whoami:public"
13+
allow_encoded_slashes: "off"
1314
match:
1415
methods:
1516
- GET

0 commit comments

Comments
 (0)