Enhance graceful shutdown handling in worker deployment

Author: sdaberdaku

charts/trino/templates/deployment-worker.yaml

@@ -218,12 +218,15 @@ spec:
                 command:
                   - /bin/sh
                   - -c
-                  - >-
-                    curl -v -X PUT
-                    -d '"SHUTTING_DOWN"'
-                    -H 'Content-type: application/json'
-                    -H 'X-Trino-User: admin'
-                    http://localhost:{{- .Values.service.port -}}/v1/info/state
+                  - |-
+                    # send shutdown request to worker
+                    curl -v -X PUT \
+                      -d '"SHUTTING_DOWN"' \
+                      -H 'Content-type: application/json' \
+                      -H 'X-Trino-User: admin' \
+                      http://localhost:{{- .Values.service.port -}}/v1/info/state
+                    # wait for shutdown to complete
+                    tail --pid=1 -f /dev/null
             {{- end }}
           resources:
             {{- toYaml .Values.worker.resources | nindent 12 }}

charts/trino/templates/tests/test-graceful-shutdown.yaml

@@ -15,7 +15,7 @@ metadata:
 rules:
   - apiGroups: [ "" ]
     resources: [ "pods" ]
-    verbs: [ "get", "list", "delete" ]
+    verbs: [ "delete", "get", "list", "watch" ]
   - apiGroups: [ "" ]
     resources: [ "pods/log" ]
     verbs: [ "get" ]

tests/trino/test-graceful-shutdown-values.yaml

@@ -1,6 +1,6 @@
 worker:
   gracefulShutdown:
     enabled: true
-    gracePeriodSeconds: 60
+    gracePeriodSeconds: 5
 
   terminationGracePeriodSeconds: 120