From 429c38ed06b2daf0155f768edb91fd59195fa1ee Mon Sep 17 00:00:00 2001
From: Arielly Parussulo <ariellyp@opera.com>
Date: Mon, 22 Apr 2024 15:04:05 +0200
Subject: [PATCH] Add grpc probe to deployment

---
 application/templates/deployment.yaml  |  9 +++++++++
 application/tests/deployment_test.yaml | 21 +++++++++++++++++++++
 application/values.yaml                |  3 +++
 3 files changed, 33 insertions(+)

diff --git a/application/templates/deployment.yaml b/application/templates/deployment.yaml
index a2f6cd4f..b69eef4a 100644
--- a/application/templates/deployment.yaml
+++ b/application/templates/deployment.yaml
@@ -199,6 +199,9 @@ spec:
           {{- else if .Values.deployment.startupProbe.tcpSocket }}
           tcpSocket:
             {{- toYaml .Values.deployment.startupProbe.tcpSocket | nindent 12 }}
+          {{- else if .Values.deployment.startupProbe.grpc }}
+          grpc:
+            {{- toYaml .Values.deployment.startupProbe.grpc | nindent 12 }}
           {{- end }}
         {{- end }}
         {{- if .Values.deployment.livenessProbe.enabled }} 
@@ -217,6 +220,9 @@ spec:
           {{- else if .Values.deployment.livenessProbe.tcpSocket }}
           tcpSocket:
             {{- toYaml .Values.deployment.livenessProbe.tcpSocket | nindent 12 }}
+          {{- else if .Values.deployment.livenessProbe.grpc }}
+          grpc:
+            {{- toYaml .Values.deployment.livenessProbe.grpc | nindent 12 }}
           {{- end }}
         {{- end }}
         {{- if .Values.deployment.readinessProbe.enabled }} 
@@ -235,6 +241,9 @@ spec:
           {{- else if .Values.deployment.readinessProbe.tcpSocket }}
           tcpSocket:
             {{- toYaml .Values.deployment.readinessProbe.tcpSocket | nindent 12 }}
+          {{- else if .Values.deployment.readinessProbe.grpc }}
+          grpc:
+            {{- toYaml .Values.deployment.readinessProbe.grpc | nindent 12 }}
           {{- end }}
         {{- end }}
       {{- if or (.Values.deployment.volumeMounts) (and (eq .Values.persistence.enabled true) (eq .Values.persistence.mountPVC true) )}} 
diff --git a/application/tests/deployment_test.yaml b/application/tests/deployment_test.yaml
index 07a22287..d8f18322 100644
--- a/application/tests/deployment_test.yaml
+++ b/application/tests/deployment_test.yaml
@@ -101,3 +101,24 @@ tests:
       - equal:
           path: spec.template.spec.serviceAccountName
           value: example-app
+
+  - it: uses grpc probing when set
+    set:
+      applicationName: example-app
+      deployment.startupProbe.enabled: true
+      deployment.startupProbe.grpc.port: 5000
+      deployment.readinessProbe.enabled: true
+      deployment.readinessProbe.grpc.port: 5000
+      deployment.livenessProbe.enabled: true
+      deployment.livenessProbe.grpc.port: 5000
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].startupProbe.grpc.port
+          value: 5000
+      - equal:
+          path: spec.template.spec.containers[0].readinessProbe.grpc.port
+          value: 5000
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.grpc.port
+          value: 5000
+
diff --git a/application/values.yaml b/application/values.yaml
index ee3ab15d..bce63059 100644
--- a/application/values.yaml
+++ b/application/values.yaml
@@ -209,6 +209,7 @@ deployment:
     httpGet: {}
     exec: {}
     tcpSocket: {}
+    grpc: {}
 
   readinessProbe:
     enabled: false
@@ -221,6 +222,7 @@ deployment:
     httpGet: {}
     exec: {}
     tcpSocket: {}
+    grpc: {}
 
   livenessProbe:
     enabled: false
@@ -233,6 +235,7 @@ deployment:
     httpGet: {}
     exec: {}
     tcpSocket: {}
+    grpc: {}
 
   # Resources to be defined for pod
   resources: