If shutdownGracePeriod is specified, but with 0s grace period, then d…

…on't delay sriov shutdown

bindata/scripts/clean-k8s-services.sh

@@ -40,9 +40,9 @@ function clean_services() {
   fi
 }
 
-# If the kubelet is configured to shutdown gracefully, we need to wait for
+# If the kubelet is configured to shutdown gracefully (>0s shutdownGracePeriod), we need to wait for
 # things to settle before shutting down the node.
-if grep "$kubelet_config_path" -e shutdownGrace >/dev/null; then
+if grep "$kubelet_config_path" -e shutdownGracePeriod | grep -qv \"0s\"; then
   start=$(date +%s)
   while [ $(( $(date +%s) - $start )) -lt $wait_time ]; do
     if [ ! -f "$delay_shutdown_path" ]; then  # don't have to wait anymore