pre_stop_hook templating

grpc · Feb 22, 2024 · 498c524 · 498c524
1 parent abf8952
commit 498c524
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 19 deletions.
diff --git a/kubernetes-manifests/prestop-hook.yaml b/kubernetes-manifests/prestop-hook.yaml
@@ -1,15 +1,40 @@
-<%def name="lifecycle()">
-  % if pre_stop_hook:
-    preStop:
-      exec:
-        command:
-        - "grpcurl"
-        - "-plaintext"
-        - "-import-path"
-        - "/"
-        - "-proto"
-        - "/src/proto/grpc/testing/test.proto"
-        - "localhost:8000"
-        - "grpc.testing.HookService/Hook"
-  % endif
+<%def name="lifecycle()" filter="trim">
+      ## containers:
+        lifecycle:
+          preStop:
+            exec:
+              command:
+              - "grpcurl"
+              - "-plaintext"
+              - "-import-path"
+              - "/"
+              - "-proto"
+              - "/src/proto/grpc/testing/test.proto"
+              - "localhost:8000"
+              - "grpc.testing.HookService/Hook"
+</%def>
+<%def name="container()" filter="trim">
+      ## containers:
+      - name: hook
+        image: gcr.io/grpc-testing/rbellevi/pre-stop-hook-test:6
+        lifecycle:
+          preStop:
+            exec:
+              command: ["/prestop.sh"]
+        volumeMounts:
+          ${volume_mount()}
+</%def>
+<%def name="volume_mount()" filter="trim">
+      ## containers:
+        ## volumeMounts:
+          - name: prestop-hook-volume
+            ## TODO(sergiitk): update to /tmp/prestop-hook
+            mountPath: /hook
+
+</%def>
+<%def name="volume()" filter="trim">
+      ## volumes:
+        - name: prestop-hook-volume
+          emptyDir:
+            medium: Memory
 </%def>
diff --git a/kubernetes-manifests/server.deployment.yaml b/kubernetes-manifests/server.deployment.yaml
@@ -1,4 +1,4 @@
-<%namespace name="prestop_hook" file="prestop-hook.yaml" import="pre_stop_hook" />
+<%namespace name="prestop_hook" file="prestop-hook.yaml" />
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -39,6 +39,7 @@ spec:
           ## Extend the number of probes well beyond the duration of the test
           ## driver waiting for the container to start.
           failureThreshold: 1000
+        ${prestop_hook.lifecycle() if pre_stop_hook else ''}
         args:
           - "--port=${test_port}"
           % if enable_csm_observability:
@@ -77,15 +78,15 @@ spec:
           - mountPath: /tmp/grpc-xds/
             name: grpc-td-conf
             readOnly: true
+          ${prestop_hook.volume_mount() if pre_stop_hook else ''}
         resources:
           limits:
             cpu: 800m
             memory: 512Mi
           requests:
             cpu: 100m
             memory: 512Mi
-        lifecycle:
-          ${prestop_hook.lifecycle()}
+      ${prestop_hook.container() if pre_stop_hook else ''}
       initContainers:
         - name: grpc-td-init
           image: ${td_bootstrap_image}
@@ -118,4 +119,5 @@ spec:
         - name: grpc-td-conf
           emptyDir:
             medium: Memory
+        ${prestop_hook.volume() if pre_stop_hook else ''}
 ...
diff --git a/tests/gamma/affinity_session_drain_test.py b/tests/gamma/affinity_session_drain_test.py
@@ -36,10 +36,12 @@
 RpcTypeUnaryCall = xds_url_map_testcase.RpcTypeUnaryCall
 
 # Constants
-REPLICA_COUNT = 3
+# TODO(sergiitk): set to 3
+REPLICA_COUNT = 1
 # We never actually hit this timeout under normal circumstances, so this large
 # value is acceptable.
-TERMINATION_GRACE_PERIOD = datetime.timedelta(minutes=2)
+# TODO(sergiitk): reset to 10
+TERMINATION_GRACE_PERIOD = datetime.timedelta(minutes=1)
 DRAINING_TIMEOUT = datetime.timedelta(minutes=10)