DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure DeleteDeployment waits until there are no pods running (#5269)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-03-20 13:02:15 -03:00 committed by GitHub
parent 78bd7d1642
commit d72ff0f8af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
test/e2e/framework/deployment.go
View file

@ -368,9 +368,14 @@ func (f *Framework) NewDeployment(name, image string, port int32, replicas int32
func (f *Framework) DeleteDeployment(name string) error { func (f *Framework) DeleteDeployment(name string) error {
d, err := f.KubeClientSet.AppsV1().Deployments(f.Namespace).Get(name, metav1.GetOptions{}) d, err := f.KubeClientSet.AppsV1().Deployments(f.Namespace).Get(name, metav1.GetOptions{})
assert.Nil(ginkgo.GinkgoT(), err, "getting deployment") assert.Nil(ginkgo.GinkgoT(), err, "getting deployment")
err = f.KubeClientSet.AppsV1().Deployments(f.Namespace).Delete(name, &metav1.DeleteOptions{})
grace := int64(0)
err = f.KubeClientSet.AppsV1().Deployments(f.Namespace).Delete(name, &metav1.DeleteOptions{
GracePeriodSeconds: &grace,
})
assert.Nil(ginkgo.GinkgoT(), err, "deleting deployment") assert.Nil(ginkgo.GinkgoT(), err, "deleting deployment")
return WaitForPodsDeleted(f.KubeClientSet, time.Second*60, f.Namespace, metav1.ListOptions{
return WaitForPodsDeleted(f.KubeClientSet, 2*time.Minute, f.Namespace, metav1.ListOptions{
LabelSelector: labelSelectorToString(d.Spec.Selector.MatchLabels), LabelSelector: labelSelectorToString(d.Spec.Selector.MatchLabels),
}) })
} }