Merge pull request #128 from GDATASoftwareAG/gateway-api-support

Change names of GatewayAPI resources and fix header for websocket match

Author: cavus700

charts/vaas/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: vaas
-version: 3.3.0-alpha.2
+version: 3.3.0-beta.1
 description: Deployment of a Verdict-as-a-Service on-premise instance
 maintainers:
   - name: G DATA CyberDefense AG

charts/vaas/templates/gateway-api/gateway.yaml

@@ -3,7 +3,7 @@
 apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
-  name: {{ default (include "gateway-api.fullname" .) .Values.gatewayApi.nameOverride }}
+  name: {{ include "gateway-api.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{ include "gateway-api.labels" . | nindent 4 }}

charts/vaas/templates/gateway-api/http-redirect-route.yaml

@@ -3,7 +3,7 @@
 apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
-  name: {{ default (include "gateway-api.fullname" .) .Values.gatewayApi.nameOverride }}
+  name: {{ include "gateway-api.fullname" . }}-redirect-route
   namespace: {{ .Release.Namespace }}
 spec:
   parentRefs:

charts/vaas/templates/gateway/http-route.yaml

@@ -3,7 +3,7 @@
 apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
-  name: {{ include "gateway.fullname" . }}
+  name: {{ include "gateway-api.fullname" . }}-gateway-route
   namespace: {{ .Release.Namespace }}
 spec:
   parentRefs:
@@ -19,11 +19,12 @@ spec:
         - name: {{ include "gateway.fullname" . }}
           port: {{ .Values.gateway.service.ws.port }}
           weight: 1
-      header:
-        - name: Upgrade
-          value: websocket
       matches:
-        - path:
+        - headers:
+            - name: Upgrade
+              value:
+                websocket
+          path:
             type: PathPrefix
             value: /
     - backendRefs: