Merge pull request kubernetes#17736 from BenTheElder/grace-again

correct grace period config and match bootstrap

Author: k8s-ci-robot

config/jobs/kubernetes-sigs/kind/kind-presubmits.yaml

@@ -64,7 +64,7 @@ presubmits:
     path_alias: sigs.k8s.io/kind
     decoration_config:
       timeout: 40m
-      terminationGracePeriodSeconds: 300
+      grace_period: 15m
     spec:
       containers:
       - image: gcr.io/k8s-testimages/krte:v20200430-04773e2-master
@@ -166,7 +166,7 @@ presubmits:
     path_alias: sigs.k8s.io/kind
     decoration_config:
       timeout: 40m
-      terminationGracePeriodSeconds: 300
+      grace_period: 15m
     spec:
       containers:
       - image: gcr.io/k8s-testimages/krte:v20200430-04773e2-master
@@ -215,7 +215,7 @@ presubmits:
     path_alias: sigs.k8s.io/kind
     decoration_config:
       timeout: 40m
-      terminationGracePeriodSeconds: 300
+      grace_period: 15m
     spec:
       containers:
       - image: gcr.io/k8s-testimages/krte:v20200430-04773e2-1.18

config/jobs/kubernetes/sig-testing/kubernetes-kind-presubmits.yaml

@@ -13,7 +13,7 @@ presubmits:
       preset-kind-volume-mounts: "true"
     decoration_config:
       timeout: 60m
-      terminationGracePeriodSeconds: 300
+      grace_period: 15m
     path_alias: k8s.io/kubernetes
     spec:
       containers:
@@ -64,7 +64,7 @@ presubmits:
       preset-kind-volume-mounts: "true"
     decoration_config:
       timeout: 60m
-      terminationGracePeriodSeconds: 300
+      grace_period: 15m
     path_alias: k8s.io/kubernetes
     spec:
       containers:
@@ -115,7 +115,7 @@ presubmits:
       preset-kind-volume-mounts: "true"
     decoration_config:
       timeout: 60m
-      terminationGracePeriodSeconds: 300
+      grace_period: 15m
     path_alias: k8s.io/kubernetes
     spec:
       containers:
@@ -170,7 +170,7 @@ presubmits:
       preset-kind-volume-mounts: "true"
     decoration_config:
       timeout: 60m
-      terminationGracePeriodSeconds: 300
+      grace_period: 15m
     path_alias: k8s.io/kubernetes
     spec:
       containers:
@@ -226,7 +226,7 @@ presubmits:
       preset-kind-volume-mounts: "true"
     decoration_config:
       timeout: 2h # allow plenty of time for a serial conformance run
-      terminationGracePeriodSeconds: 300
+      grace_period: 15m
     path_alias: k8s.io/kubernetes
     spec:
       containers:
@@ -270,7 +270,7 @@ presubmits:
       preset-kind-volume-mounts: "true"
     decoration_config:
       timeout: 60m
-      terminationGracePeriodSeconds: 300
+      grace_period: 15m
     path_alias: k8s.io/kubernetes
     spec:
       containers: