Merge pull request #67 from linuxfoundation/bramwelt/argocd-diffs

Update HTTPRoutes and RuleSets with missing fields

Author: bramwelt

charts/lfx-platform/Chart.yaml

@@ -5,7 +5,7 @@ apiVersion: v2
 name: lfx-platform
 description: LFX Platform v2 Helm chart
 type: application
-version: 0.3.0
+version: 0.3.1
 icon: https://github.com/linuxfoundation/lfx-v2-helm/raw/main/img/lfx-logo-color.svg
 dependencies:
   - name: traefik

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

@@ -11,19 +11,30 @@ metadata:
 spec:
   parentRefs:
 {{- if .Values.gateway.enabled }}
-    - name: {{ .Values.gateway.name | default "lfx-platform-gateway" }}
+    - group: gateway.networking.k8s.io
+      kind: Gateway
+      name: {{ .Values.gateway.name | default "lfx-platform-gateway" }}
       sectionName: {{ include "lfx-platform.default-listener" . }}
       namespace: {{ .Release.Namespace }}
 {{- else }}
-    - name: {{ .Values.lfx.parentGateway.name }}
+    - group: gateway.networking.k8s.io
+      kind: Gateway
+      name: {{ .Values.lfx.parentGateway.name }}
       sectionName: {{ .Values.lfx.parentGateway.sectionName }}
       namespace: {{ .Values.lfx.parentGateway.namespace }}
 {{- end }}
   hostnames:
     - 'mailpit.{{ .Values.lfx.domain }}'
   rules:
     - backendRefs:
-        - name: {{ include "common.names.fullname" .Subcharts.mailpit }}-http
+        - group: ""
+          kind: Service
+          name: {{ include "common.names.fullname" .Subcharts.mailpit }}-http
           namespace: {{ .Release.Namespace }}
           port: {{ .Values.mailpit.service.http.port }}
+          weight: 1
+      matches:
+        - path:
+            type: PathPrefix
+            value: /
 {{- end }}

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

@@ -11,11 +11,15 @@ metadata:
 spec:
   parentRefs:
 {{- if .Values.gateway.enabled }}
-    - name: {{ .Values.gateway.name | default "lfx-platform-gateway" }}
+    - group: gateway.networking.k8s.io
+      kind: Gateway
+      name: {{ .Values.gateway.name | default "lfx-platform-gateway" }}
       sectionName: {{ include "lfx-platform.http-listener" . }}
       namespace: {{ .Release.Namespace }}
 {{- else }}
-    - name: {{ .Values.lfx.parentGateway.name }}
+    - group: gateway.networking.k8s.io
+      kind: Gateway
+      name: {{ .Values.lfx.parentGateway.name }}
       sectionName: {{ .Values.lfx.parentGateway.sectionName }}
       namespace: {{ .Values.lfx.parentGateway.namespace }}
 {{- end }}
@@ -27,4 +31,8 @@ spec:
           requestRedirect:
             scheme: https
             statusCode: 301
+      matches:
+        - path:
+            type: PathPrefix
+            value: /
 {{- end }}

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

@@ -10,11 +10,15 @@ metadata:
 spec:
   parentRefs:
 {{- if .Values.gateway.enabled }}
-    - name: {{ .Values.gateway.name | default "lfx-platform-gateway" }}
+    - group: gateway.networking.k8s.io
+      kind: Gateway
+      name: {{ .Values.gateway.name | default "lfx-platform-gateway" }}
       sectionName: {{ include "lfx-platform.default-listener" . }}
       namespace: {{ .Release.Namespace }}
 {{- else }}
-    - name: {{ .Values.lfx.parentGateway.name }}
+    - group: gateway.networking.k8s.io
+      kind: Gateway
+      name: {{ .Values.lfx.parentGateway.name }}
       sectionName: {{ .Values.lfx.parentGateway.sectionName }}
       namespace: {{ .Values.lfx.parentGateway.namespace }}
 {{- end }}
@@ -39,6 +43,9 @@ spec:
               type: ReplacePrefixMatch
               replacePrefixMatch: /
       backendRefs:
-        - name: swagger-ui
+        - group: ""
+          kind: Service
+          name: swagger-ui
           port: 80
+          weight: 1
 {{- end }}

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

@@ -10,6 +10,7 @@ metadata:
 spec:
   rules:
     - id: "rule:lfx:swagger_ui:public"
+      allow_encoded_slashes: "off"
       match:
         methods:
           - GET

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

@@ -11,11 +11,15 @@ metadata:
 spec:
   parentRefs:
 {{- if .Values.gateway.enabled }}
-    - name: {{ .Values.gateway.name | default "lfx-platform-gateway" }}
+    - group: gateway.networking.k8s.io
+      kind: Gateway
+      name: {{ .Values.gateway.name | default "lfx-platform-gateway" }}
       sectionName: {{ include "lfx-platform.default-listener" . }}
       namespace: {{ .Release.Namespace }}
 {{- else }}
-    - name: {{ .Values.lfx.parentGateway.name }}
+    - group: gateway.networking.k8s.io
+      kind: Gateway
+      name: {{ .Values.lfx.parentGateway.name }}
       sectionName: {{ .Values.lfx.parentGateway.sectionName }}
       namespace: {{ .Values.lfx.parentGateway.namespace }}
 {{- end }}
@@ -36,6 +40,9 @@ spec:
             name: heimdall
       {{- end }}
       backendRefs:
-        - name: whoami
+        - group: ""
+          kind: Service
+          name: whoami
           port: 80
+          weight: 1
 {{- end }}

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

@@ -10,6 +10,7 @@ metadata:
 spec:
   rules:
     - id: "rule:lfx:whoami:public"
+      allow_encoded_slashes: "off"
       match:
         methods:
           - GET