shutdown drainTimeout should also affect envoy drain time (envoyproxy…

…#2898) Signed-off-by: Arko Dasgupta <[email protected]>
Xunzhuo · Mar 12, 2024 · bb0a9a7 · bb0a9a7
1 parent 87eb555
commit bb0a9a7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/internal/infrastructure/kubernetes/proxy/resource.go b/internal/infrastructure/kubernetes/proxy/resource.go
@@ -177,6 +177,10 @@ func expectedProxyContainers(infra *ir.ProxyInfra,
 		args = append(args, fmt.Sprintf("--component-log-level %s", componentsLogLevel))
 	}
 
+	if shutdownConfig != nil && shutdownConfig.DrainTimeout != nil {
+		args = append(args, fmt.Sprintf("--drain-time-s %.0f", shutdownConfig.DrainTimeout.Seconds()))
+	}
+
 	if infra.Config != nil {
 		args = append(args, infra.Config.Spec.ExtraArgs...)
 	}

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml
@@ -167,6 +167,7 @@ spec:
                         resource_api_version: V3
         - --log-level warn
         - --cpuset-threads
+        - --drain-time-s 30
         command:
         - envoy
         env: