sophora-server: add grpc-httproute

Author: DanielRaapDev

charts/sophora-server/templates/grpc-httproute.yaml

@@ -0,0 +1,32 @@
+{{- if and .Values.grpcHttproute.enabled .Values.sophora.grpcApi.enabled -}}
+  {{- $fullName := include "sophora-server.fullname" . -}}
+  {{- $routeName := printf "%s-grpc" ($fullName | trunc 58 | trimSuffix "-") }}
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: {{ $routeName }}
+  labels: {{ include "sophora-server.topLevelLabels" . | nindent 4 }}
+  {{- with .Values.grpcHttproute.annotations }}
+  annotations:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- with .Values.grpcHttproute.parentRefs }}
+  parentRefs:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- if .Values.grpcHttproute.hostnames }}
+  hostnames:
+  {{- range .Values.grpcHttproute.hostnames }}
+    - {{ . | quote }}
+  {{- end }}
+  {{- end }}
+  rules:
+    - backendRefs:
+        - name: {{ $fullName }}
+          port: {{ .Values.sophora.server.ports.grpc }}
+      matches:
+        - path:
+            type: {{ .Values.grpcHttproute.pathMatchType | default "PathPrefix" }}
+            value: {{ .Values.grpcHttproute.pathValue | default "/sophora.srpc" }}
+{{- end }}

charts/sophora-server/test-values.yaml

@@ -127,15 +127,8 @@ ingress:
   hosts:
     - host: "sophora.domain.de"
 
-httproute:
-  enabled: true
-  parentRefs:
-    - name: test-gateway
-      namespace: gateway-system
-  hostnames:
-    - "sophora-server.test.example.com"
-
 grpcIngress:
+  enabled: true
   ingressClassName: nginx
   annotations:
     nginx.ingress.kubernetes.io/use-regex: "true"
@@ -144,6 +137,22 @@ grpcIngress:
     - host: "sophora.domain.de"
       path: /sophora\.srpc.*
 
+httproute:
+  enabled: true
+  parentRefs:
+    - name: test-gateway
+      namespace: gateway-system
+  hostnames:
+    - "sophora-server.test.example.com"
+
+grpcHttproute:
+  enabled: true
+  parentRefs:
+    - name: test-gateway
+      namespace: gateway-system
+  hostnames:
+    - "sophora-server.test.example.com"
+
 extraDeploy:
   - |
     apiVersion: keda.sh/v1alpha1

charts/sophora-server/values.yaml

@@ -365,19 +365,6 @@ ingress:
   #    hosts:
   #      - chart-example.local
 
-httproute:
-  enabled: false
-  # parentRefs:
-  #   - name: my-gateway
-  #     namespace: gateway-namespace
-  parentRefs: []
-  # hostnames:
-  #   - "server.example.com"
-  hostnames: []
-  pathMatchType: PathPrefix
-  pathValue: /
-  annotations: {}
-
 # This can be used to configure a different ingress for the SRPC service as it might require different settings.
 # The SRPC-communication relies on gRPC as communication protocol and e.g. nginx needs to be explicitly informed that the backend protocol is gRPC
 # The paths can be regex-matched since all SRPC-calls have the root-path sophora.srpc
@@ -398,6 +385,35 @@ grpcIngress:
   #    hosts:
   #      - chart-example.local
 
+httproute:
+  enabled: false
+  # parentRefs:
+  #   - name: my-gateway
+  #     namespace: gateway-namespace
+  parentRefs: []
+  # hostnames:
+  #   - "server.example.com"
+  hostnames: []
+  pathMatchType: PathPrefix
+  pathValue: /
+  annotations: {}
+
+# This can be used to configure a different HttpRoute for the SRPC service as it might require different settings.
+# The SRPC-communication relies on gRPC as communication protocol and e.g. nginx needs to be explicitly informed that the backend protocol is gRPC
+# The paths can be regex-matched since all SRPC-calls have the root-path sophora.srpc
+grpcHttproute:
+  enabled: false
+  # parentRefs:
+  #   - name: my-gateway
+  #     namespace: gateway-namespace
+  parentRefs: []
+  # hostnames:
+  #   - "server.example.com"
+  hostnames: []
+  pathMatchType: PathPrefix
+  pathValue: /sophora.srpc
+  annotations: {}
+
 service:
   annotations: {}
   headlessAnnotations: {}