feat: gateway.networking.k8s.io/v1 (#38)

Author: shcherbak

charts/synapse/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 appVersion: 1.151.0
 description: matrix synapse kubernetes deployment
 name: synapse
-version: 2.8.4
+version: 2.9.0

charts/synapse/templates/admin-httproute.yaml

@@ -0,0 +1,26 @@
+{{- if .Values.admin.gatewayApi.enabled }}
+---
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: synapse-admin
+  {{- if or .Values.admin.gatewayApi.annotations .Values.admin.gatewayApi.commonAnnotations }}
+  {{ $annotations := merge .Values.admin.gatewayApi.annotations .Values.admin.gatewayApi.commonAnnotations }}
+  annotations: {{ toYaml $annotations | nindent 4 }}
+  {{- end }}
+spec:
+  parentRefs:
+    {{- toYaml .Values.admin.gatewayApi.parentRefs | nindent 4 }}
+  {{- if .Values.admin.ingress.serverName }}
+  hostnames:
+    - {{ .Values.admin.ingress.serverName }}
+  {{- end }}
+  rules:
+    - matches:
+        - path:
+            type: PathPrefix
+            value: /
+      backendRefs:
+        - name: admin
+          port: 80
+{{- end }}

charts/synapse/templates/matrix-authentication-httproute.yaml

@@ -0,0 +1,28 @@
+{{- if .Values.matrixAuthentication.enabled }}
+{{- if .Values.matrixAuthentication.gatewayApi.enabled }}
+---
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: matrix-authentication
+  {{- if or .Values.matrixAuthentication.gatewayApi.annotations .Values.matrixAuthentication.gatewayApi.commonAnnotations }}
+  {{ $annotations := merge .Values.matrixAuthentication.gatewayApi.annotations .Values.matrixAuthentication.gatewayApi.commonAnnotations }}
+  annotations: {{ toYaml $annotations | nindent 4 }}
+  {{- end }}
+spec:
+  parentRefs:
+    {{- toYaml .Values.matrixAuthentication.gatewayApi.parentRefs | nindent 4 }}
+  {{- if .Values.matrixAuthentication.ingress.host }}
+  hostnames:
+    - {{ .Values.matrixAuthentication.ingress.host }}
+  {{- end }}
+  rules:
+    - matches:
+        - path:
+            type: PathPrefix
+            value: /
+      backendRefs:
+        - name: matrix-authentication
+          port: 80
+{{- end }}
+{{- end }}

charts/synapse/templates/synapse-httproute.yaml

@@ -0,0 +1,26 @@
+{{- if .Values.gatewayApi.enabled }}
+---
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: synapse
+  {{- if or .Values.gatewayApi.annotations .Values.gatewayApi.commonAnnotations }}
+  {{ $annotations := merge .Values.gatewayApi.annotations .Values.gatewayApi.commonAnnotations }}
+  annotations: {{ toYaml $annotations | nindent 4 }}
+  {{- end }}
+spec:
+  parentRefs:
+    {{- toYaml .Values.gatewayApi.parentRefs | nindent 4 }}
+  {{- if .Values.synapse.serverName }}
+  hostnames:
+    - {{ .Values.synapse.serverName }}
+  {{- end }}
+  rules:
+    - matches:
+        - path:
+            type: PathPrefix
+            value: /
+      backendRefs:
+        - name: synapse-client-reader-envoy
+          port: 80
+{{- end }}

charts/synapse/templates/well-known-httproute.yaml

@@ -0,0 +1,26 @@
+{{- if .Values.wellKnown.gatewayApi.enabled }}
+---
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: well-known
+  {{- if or .Values.wellKnown.gatewayApi.annotations .Values.wellKnown.gatewayApi.commonAnnotations }}
+  {{ $annotations := merge .Values.wellKnown.gatewayApi.annotations .Values.wellKnown.gatewayApi.commonAnnotations }}
+  annotations: {{ toYaml $annotations | nindent 4 }}
+  {{- end }}
+spec:
+  parentRefs:
+    {{- toYaml .Values.wellKnown.gatewayApi.parentRefs | nindent 4 }}
+  {{- if .Values.synapse.serverName }}
+  hostnames:
+    - {{ .Values.synapse.serverName }}
+  {{- end }}
+  rules:
+    - matches:
+        - path:
+            type: RegularExpression
+            value: /\.well-known/matrix
+      backendRefs:
+        - name: well-known
+          port: 80
+{{- end }}

charts/synapse/tests/golden/fixtures/test-admin-httproute-disabled.golden.yaml

@@ -0,0 +1,20 @@
+---
+# Source: synapse/templates/admin-httproute.yaml
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: synapse-admin
+spec:
+  parentRefs:
+    - name: matrix-gateway
+      namespace: gateway-system
+  hostnames:
+    - NOT-CONFIGURED
+  rules:
+    - matches:
+        - path:
+            type: PathPrefix
+            value: /
+      backendRefs:
+        - name: admin
+          port: 80

charts/synapse/tests/golden/fixtures/test-admin-httproute.golden.yaml

@@ -16,4 +16,4 @@ spec:
   selector:
     matchLabels:
       app: synapse
-      component: synapse-client-reader-envoy
+      component: synapse-client-reader-envoy

charts/synapse/tests/golden/fixtures/test-envoy-servicemonitor.golden.yaml

@@ -0,0 +1,20 @@
+---
+# Source: synapse/templates/matrix-authentication-httproute.yaml
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: matrix-authentication
+spec:
+  parentRefs:
+    - name: matrix-gateway
+      namespace: gateway-system
+  hostnames:
+    - NOT-CONFIGURED
+  rules:
+    - matches:
+        - path:
+            type: PathPrefix
+            value: /
+      backendRefs:
+        - name: matrix-authentication
+          port: 80