github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #123722 from atiratree/e2e-kubectl-delete-fix

Browse Source 
fix e2e test for kubectl interactive delete
This commit is contained in:
Kubernetes Prow Robot
2024-03-05 13:45:07 -08:00
committed by GitHub
parent df1eccae38 7a57bcea6c
commit 2bed0087c3
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/e2e/kubectl/delete.go
View File

@@ -29,6 +29,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
e2edeployment "k8s.io/kubernetes/test/e2e/framework/deployment"
admissionapi "k8s.io/pod-security-admission/api" admissionapi "k8s.io/pod-security-admission/api"
commonutils "k8s.io/kubernetes/test/e2e/common" commonutils "k8s.io/kubernetes/test/e2e/common"
@@ -57,21 +58,12 @@ var _ = SIGDescribe("Kubectl delete", func() {
e2ekubectl.RunKubectlOrDieInput(ns, deploymentYaml, "apply", "-f", "-") e2ekubectl.RunKubectlOrDieInput(ns, deploymentYaml, "apply", "-f", "-")
ginkgo.By("verifying the deployment is created and running") ginkgo.By("verifying the deployment is created and running")
err := wait.PollUntilContextTimeout(ctx, 2*time.Second, 30*time.Second, true, func(ctx context.Context) (done bool, err error) {
d, err := c.AppsV1().Deployments(ns).Get(ctx, deploymentName, metav1.GetOptions{}) d, err := c.AppsV1().Deployments(ns).Get(ctx, deploymentName, metav1.GetOptions{})
if err != nil { if err != nil {
if apierrors.IsNotFound(err) { framework.Failf("Failed getting deployment %v", err)
return false, nil
} }
return false, err err = e2edeployment.WaitForDeploymentComplete(c, d)
} framework.ExpectNoError(err, "waiting for the deployment to complete")
if d != nil && d.Status.AvailableReplicas == 2 {
return true, nil
}
return false, nil
})
framework.ExpectNoError(err, "waiting for the deployment has 2 available replicas")
ginkgo.By("check that resource is not deleted when user types no") ginkgo.By("check that resource is not deleted when user types no")
output := e2ekubectl.RunKubectlOrDieInput(ns, "n", "delete", "--interactive", "deployment", deploymentName) output := e2ekubectl.RunKubectlOrDieInput(ns, "n", "delete", "--interactive", "deployment", deploymentName)
@@ -83,8 +75,8 @@ var _ = SIGDescribe("Kubectl delete", func() {
} }
ginkgo.By("verify that deployment is not deleted") ginkgo.By("verify that deployment is not deleted")
d, err := c.AppsV1().Deployments(ns).Get(ctx, deploymentName, metav1.GetOptions{}) d, err = c.AppsV1().Deployments(ns).Get(ctx, deploymentName, metav1.GetOptions{})
if err != nil { if err != nil || d.DeletionTimestamp != nil {
framework.Failf("Failed getting deployment that shouldn't be deleted %v", err) framework.Failf("Failed getting deployment that shouldn't be deleted %v", err)
} }