Merge pull request #27 from thesse1/grpc

Add support for gRPC port (for HAFT)
SoftwareAG · Jan 19, 2024 · 7b75020 · 7b75020
2 parents 60f5102 + b184b0d
commit 7b75020
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 10 deletions.
diff --git a/apigateway/helm/templates/deployment.yaml b/apigateway/helm/templates/deployment.yaml
@@ -167,6 +167,11 @@ spec:
           - containerPort: {{ int .Values.apigw.runtimeExternalPort }} 
             name: external-http
             protocol: TCP
+          {{- if .Values.grpcService.enabled }}
+          - containerPort: {{ int .Values.apigw.grpcPort }}
+            name: grpc-http
+            protocol: TCP
+          {{- end }}
           {{- if .Values.extraPorts }}
           {{- toYaml .Values.extraPorts | nindent 10 }}
           {{- end }}                  

diff --git a/apigateway/helm/templates/nginx-svc.yaml b/apigateway/helm/templates/nginx-svc.yaml
@@ -29,20 +29,20 @@ metadata:
     {{ toYaml . | nindent 4 }}
     {{- end }}    
 spec:
-  type: {{ .Values.serviceType }}
+  type: {{ .Values.service.type }}
   ports:
   - port: {{ int .Values.apigw.runtimePort }}
     protocol: TCP
     targetPort: {{ int .Values.apigw.runtimePort }}
     name: rtport    
-    {{- if (eq .Values.serviceType "ClusterIP") }}
+    {{- if (eq .Values.service.type "ClusterIP") }}
     nodePort: null
     {{- end }}
   - port: {{ int .Values.apigw.uiPort }}
     protocol: TCP
     targetPort: {{ int .Values.apigw.uiPort }}
     name: uiport
-    {{- if (eq .Values.serviceType "ClusterIP") }}
+    {{- if (eq .Values.service.type "ClusterIP") }}
     nodePort: null
     {{- end }}
   selector:

diff --git a/apigateway/helm/templates/service.yaml b/apigateway/helm/templates/service.yaml
@@ -27,13 +27,13 @@ metadata:
     {{ toYaml . | nindent 4 }}
     {{- end }}
 spec:
-  type: {{ .Values.serviceType }}
+  type: {{ .Values.service.type }}
   ports:
   - port: {{ int .Values.apigw.runtimePort }}
     protocol: TCP
     targetPort: {{ int .Values.apigw.runtimePort }}
     name: rtport
-    {{- if (eq .Values.serviceType "ClusterIP") }}
+    {{- if (eq .Values.service.type "ClusterIP") }}
     nodePort: null
     {{- end }}
   selector:
@@ -49,13 +49,13 @@ metadata:
     {{ toYaml . | nindent 4 }}
     {{- end }}
 spec:
-  type: {{ .Values.serviceType }}
+  type: {{ .Values.service.type }}
   ports:
   - port: {{ int .Values.apigw.adminPort }}
     protocol: TCP
     targetPort: {{ int .Values.apigw.adminPort }}
     name: adminport
-    {{- if (eq .Values.serviceType "ClusterIP") }}
+    {{- if (eq .Values.service.type "ClusterIP") }}
     nodePort: null
     {{- end }}
   selector:
@@ -71,7 +71,7 @@ metadata:
     {{ toYaml . | nindent 4 }}
     {{- end }}
 spec:
-  type: {{ .Values.serviceType }}
+  type: {{ .Values.service.type }}
   sessionAffinity: ClientIP
   sessionAffinityConfig:
     clientIP:
@@ -81,8 +81,36 @@ spec:
     protocol: TCP
     targetPort: {{ int .Values.apigw.uiPort }}
     name: uiport
-    {{- if (eq .Values.serviceType "ClusterIP") }}
+    {{- if (eq .Values.service.type "ClusterIP") }}
     nodePort: null
     {{- end }}
   selector:
-    {{- include "common.labels.matchLabels" . | nindent 4}}
+    {{- include "common.labels.matchLabels" . | nindent 4}}
+{{- if .Values.grpcService.enabled }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "common.names.fullname" . }}-grpc
+  {{- if .Values.grpcService.azureInternalLoadBalancer }}
+  annotations:
+    service.beta.kubernetes.io/azure-load-balancer-internal: "true"
+  {{- end }}
+  labels:     
+    {{- include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  type: {{ .Values.grpcService.type }}
+  ports:
+  - port: {{ int .Values.apigw.grpcPort }}
+    protocol: TCP
+    targetPort: {{ int .Values.apigw.grpcPort }}
+    name: grpcport
+    {{- if (eq .Values.grpcService.type "ClusterIP") }}
+    nodePort: null
+    {{- end }}
+  selector:
+    {{- include "common.labels.matchLabels" . | nindent 4}}
+{{- end }}
diff --git a/apigateway/helm/values.yaml b/apigateway/helm/values.yaml
@@ -96,6 +96,11 @@ service:
   type: ClusterIP
   port: 80
 
+grpcService:
+  enabled: false
+  type: LoadBalancer
+  azureInternalLoadBalancer: false
+
 # multiple ingresses for ui, admin, ext and rt 
 ingresses: 
   ui:
@@ -281,6 +286,8 @@ apigw:
   adminPort:               5555
   # -- External Runtime Port for Reverse Invoke Setups. This port must be manually setup after API Gateway was initizalized.
   runtimeExternalPort:     6555
+  # -- gRPC port for High Availability and Fault Tolerance (HAFT) solution. This port must be manually setup after API Gateway was initizalized.
+  grpcPort:                4440
   readinessProbe:
     # -- The readinessprobe scheme (https or http).
     scheme:                "HTTP"