github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Try speeding up ConfigMap e2e namespace deletion

Browse Source
This commit is contained in:
Clayton Coleman 2017-03-13 00:37:04 -04:00
parent fcab3a442d
commit 4f35b31fc7
No known key found for this signature in database
GPG Key ID: 3D16906B4F1C5CB3
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/common/configmap.go
View File

@ -539,6 +539,7 @@ func doConfigMapE2EWithoutMappings(f *framework.Framework, uid, fsGroup int64, d
framework.Failf("unable to create test configMap %s: %v", configMap.Name, err) framework.Failf("unable to create test configMap %s: %v", configMap.Name, err)
} }
one := int64(1)
pod := &v1.Pod{ pod := &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "pod-configmaps-" + string(uuid.NewUUID()), Name: "pod-configmaps-" + string(uuid.NewUUID()),
@ -572,7 +573,8 @@ func doConfigMapE2EWithoutMappings(f *framework.Framework, uid, fsGroup int64, d
}, },
}, },
}, },
RestartPolicy: v1.RestartPolicyNever, RestartPolicy: v1.RestartPolicyNever,
TerminationGracePeriodSeconds: &one,
}, },
} }
@ -617,6 +619,7 @@ func doConfigMapE2EWithMappings(f *framework.Framework, uid, fsGroup int64, item
framework.Failf("unable to create test configMap %s: %v", configMap.Name, err) framework.Failf("unable to create test configMap %s: %v", configMap.Name, err)
} }
one := int64(1)
pod := &v1.Pod{ pod := &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "pod-configmaps-" + string(uuid.NewUUID()), Name: "pod-configmaps-" + string(uuid.NewUUID()),
@ -656,7 +659,8 @@ func doConfigMapE2EWithMappings(f *framework.Framework, uid, fsGroup int64, item
}, },
}, },
}, },
RestartPolicy: v1.RestartPolicyNever, RestartPolicy: v1.RestartPolicyNever,
TerminationGracePeriodSeconds: &one,
}, },
} }

4
test/e2e/common/docker_containers.go
View File

@ -71,6 +71,7 @@ const testContainerName = "test-container"
func entrypointTestPod() *v1.Pod { func entrypointTestPod() *v1.Pod {
podName := "client-containers-" + string(uuid.NewUUID()) podName := "client-containers-" + string(uuid.NewUUID())
one := int64(1)
return &v1.Pod{ return &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: podName, Name: podName,
@ -82,7 +83,8 @@ func entrypointTestPod() *v1.Pod {
Image: "gcr.io/google_containers/eptest:0.1", Image: "gcr.io/google_containers/eptest:0.1",
}, },
}, },
RestartPolicy: v1.RestartPolicyNever, RestartPolicy: v1.RestartPolicyNever,
TerminationGracePeriodSeconds: &one,
}, },
} }
} }

6
test/utils/runners.go
View File

@ -494,6 +494,7 @@ func (config *RCConfig) create() error {
if config.DNSPolicy == nil { if config.DNSPolicy == nil {
config.DNSPolicy = &dnsDefault config.DNSPolicy = &dnsDefault
} }
one := int64(1)
rc := &v1.ReplicationController{ rc := &v1.ReplicationController{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: config.Name, Name: config.Name,
@ -517,8 +518,9 @@ func (config *RCConfig) create() error {
ReadinessProbe: config.ReadinessProbe, ReadinessProbe: config.ReadinessProbe,
}, },
}, },
DNSPolicy: *config.DNSPolicy, DNSPolicy: *config.DNSPolicy,
NodeSelector: config.NodeSelector, NodeSelector: config.NodeSelector,
TerminationGracePeriodSeconds: &one,
}, },
}, },
}, },