github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101931 from ii/update-current-term-period

Browse Source 
Increase TerminationGracePeriodSeconds to 1 second
This commit is contained in:
Kubernetes Prow Robot 2021-05-13 07:12:26 -07:00 committed by GitHub
commit b7e50cd60c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/apps/deployment.go
View File

@ -177,7 +177,7 @@ var _ = SIGDescribe("Deployment", func() {
the Deployment. the Deployment.
*/ */
framework.ConformanceIt("should run the lifecycle of a Deployment", func() { framework.ConformanceIt("should run the lifecycle of a Deployment", func() {
zero := int64(0) one := int64(1)
deploymentResource := schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "deployments"} deploymentResource := schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "deployments"}
testNamespaceName := f.Namespace.Name testNamespaceName := f.Namespace.Name
testDeploymentName := "test-deployment" testDeploymentName := "test-deployment"
@ -215,7 +215,7 @@ var _ = SIGDescribe("Deployment", func() {
Labels: testDeploymentLabelSelectors.MatchLabels, Labels: testDeploymentLabelSelectors.MatchLabels,
}, },
Spec: v1.PodSpec{ Spec: v1.PodSpec{
TerminationGracePeriodSeconds: &zero, TerminationGracePeriodSeconds: &one,
Containers: []v1.Container{{ Containers: []v1.Container{{
Name: testDeploymentName, Name: testDeploymentName,
Image: testDeploymentInitialImage, Image: testDeploymentInitialImage,
@ -272,7 +272,7 @@ var _ = SIGDescribe("Deployment", func() {
"replicas": testDeploymentMinimumReplicas, "replicas": testDeploymentMinimumReplicas,
"template": map[string]interface{}{ "template": map[string]interface{}{
"spec": map[string]interface{}{ "spec": map[string]interface{}{
"TerminationGracePeriodSeconds": &zero, "TerminationGracePeriodSeconds": &one,
"containers": [1]map[string]interface{}{{ "containers": [1]map[string]interface{}{{
"name": testDeploymentName, "name": testDeploymentName,
"image": testDeploymentPatchImage, "image": testDeploymentPatchImage,
@ -458,7 +458,7 @@ var _ = SIGDescribe("Deployment", func() {
framework.ExpectNoError(err, "failed to see replicas of %v in namespace %v scale to requested amount of %v", testDeployment.Name, testNamespaceName, testDeploymentDefaultReplicas) framework.ExpectNoError(err, "failed to see replicas of %v in namespace %v scale to requested amount of %v", testDeployment.Name, testNamespaceName, testDeploymentDefaultReplicas)
ginkgo.By("deleting the Deployment") ginkgo.By("deleting the Deployment")
err = f.ClientSet.AppsV1().Deployments(testNamespaceName).DeleteCollection(context.TODO(), metav1.DeleteOptions{GracePeriodSeconds: &zero}, metav1.ListOptions{LabelSelector: testDeploymentLabelsFlat}) err = f.ClientSet.AppsV1().Deployments(testNamespaceName).DeleteCollection(context.TODO(), metav1.DeleteOptions{GracePeriodSeconds: &one}, metav1.ListOptions{LabelSelector: testDeploymentLabelsFlat})
framework.ExpectNoError(err, "failed to delete Deployment via collection") framework.ExpectNoError(err, "failed to delete Deployment via collection")
ctx, cancel = context.WithTimeout(context.Background(), 1*time.Minute) ctx, cancel = context.WithTimeout(context.Background(), 1*time.Minute)

14
test/e2e/common/node/pods.go
View File

@ -845,7 +845,7 @@ var _ = SIGDescribe("Pods", func() {
framework.ConformanceIt("should delete a collection of pods", func() { framework.ConformanceIt("should delete a collection of pods", func() {
podTestNames := []string{"test-pod-1", "test-pod-2", "test-pod-3"} podTestNames := []string{"test-pod-1", "test-pod-2", "test-pod-3"}
zero := int64(0) one := int64(1)
ginkgo.By("Create set of pods") ginkgo.By("Create set of pods")
// create a set of pods in test namespace // create a set of pods in test namespace
@ -857,7 +857,7 @@ var _ = SIGDescribe("Pods", func() {
"type": "Testing"}, "type": "Testing"},
}, },
Spec: v1.PodSpec{ Spec: v1.PodSpec{
TerminationGracePeriodSeconds: &zero, TerminationGracePeriodSeconds: &one,
Containers: []v1.Container{{ Containers: []v1.Container{{
Image: imageutils.GetE2EImage(imageutils.Agnhost), Image: imageutils.GetE2EImage(imageutils.Agnhost),
Name: "token-test", Name: "token-test",
@ -874,7 +874,7 @@ var _ = SIGDescribe("Pods", func() {
framework.ExpectNoError(err, "3 pods not found") framework.ExpectNoError(err, "3 pods not found")
// delete Collection of pods with a label in the current namespace // delete Collection of pods with a label in the current namespace
err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).DeleteCollection(context.TODO(), metav1.DeleteOptions{GracePeriodSeconds: &zero}, metav1.ListOptions{ err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).DeleteCollection(context.TODO(), metav1.DeleteOptions{GracePeriodSeconds: &one}, metav1.ListOptions{
LabelSelector: "type=Testing"}) LabelSelector: "type=Testing"})
framework.ExpectNoError(err, "failed to delete collection of pods") framework.ExpectNoError(err, "failed to delete collection of pods")
@ -899,7 +899,7 @@ var _ = SIGDescribe("Pods", func() {
testPodImage2 := imageutils.GetE2EImage(imageutils.Httpd) testPodImage2 := imageutils.GetE2EImage(imageutils.Httpd)
testPodLabels := map[string]string{"test-pod-static": "true"} testPodLabels := map[string]string{"test-pod-static": "true"}
testPodLabelsFlat := "test-pod-static=true" testPodLabelsFlat := "test-pod-static=true"
zero := int64(0) one := int64(1)
w := &cache.ListWatch{ w := &cache.ListWatch{
WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
@ -916,7 +916,7 @@ var _ = SIGDescribe("Pods", func() {
Labels: testPodLabels, Labels: testPodLabels,
}, },
Spec: v1.PodSpec{ Spec: v1.PodSpec{
TerminationGracePeriodSeconds: &zero, TerminationGracePeriodSeconds: &one,
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: testPodName, Name: testPodName,
@ -956,7 +956,7 @@ var _ = SIGDescribe("Pods", func() {
Labels: map[string]string{"test-pod": "patched"}, Labels: map[string]string{"test-pod": "patched"},
}, },
Spec: v1.PodSpec{ Spec: v1.PodSpec{
TerminationGracePeriodSeconds: &zero, TerminationGracePeriodSeconds: &one,
Containers: []v1.Container{{ Containers: []v1.Container{{
Name: testPodName, Name: testPodName,
Image: testPodImage2, Image: testPodImage2,
@ -1023,7 +1023,7 @@ var _ = SIGDescribe("Pods", func() {
framework.ExpectEqual(podStatusFieldPatchCount, podStatusFieldPatchCountTotal, "failed to update PodStatus - field patch count doesn't match the total") framework.ExpectEqual(podStatusFieldPatchCount, podStatusFieldPatchCountTotal, "failed to update PodStatus - field patch count doesn't match the total")
ginkgo.By("deleting the Pod via a Collection with a LabelSelector") ginkgo.By("deleting the Pod via a Collection with a LabelSelector")
err = f.ClientSet.CoreV1().Pods(testNamespaceName).DeleteCollection(context.TODO(), metav1.DeleteOptions{GracePeriodSeconds: &zero}, metav1.ListOptions{LabelSelector: testPodLabelsFlat}) err = f.ClientSet.CoreV1().Pods(testNamespaceName).DeleteCollection(context.TODO(), metav1.DeleteOptions{GracePeriodSeconds: &one}, metav1.ListOptions{LabelSelector: testPodLabelsFlat})
framework.ExpectNoError(err, "failed to delete Pod by collection") framework.ExpectNoError(err, "failed to delete Pod by collection")
ginkgo.By("watching for the Pod to be deleted") ginkgo.By("watching for the Pod to be deleted")