mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Merge pull request #92954 from sbueringer/pr-fix-delete-orphan-test
conformance-tests: make orpan RS created by deployment test more resilient
This commit is contained in:
commit
0051d65f9f
@ -576,18 +576,34 @@ var _ = SIGDescribe("Garbage collector", func() {
|
|||||||
}
|
}
|
||||||
// wait for deployment to create some rs
|
// wait for deployment to create some rs
|
||||||
ginkgo.By("Wait for the Deployment to create new ReplicaSet")
|
ginkgo.By("Wait for the Deployment to create new ReplicaSet")
|
||||||
|
var replicaset appsv1.ReplicaSet
|
||||||
err = wait.PollImmediate(500*time.Millisecond, 1*time.Minute, func() (bool, error) {
|
err = wait.PollImmediate(500*time.Millisecond, 1*time.Minute, func() (bool, error) {
|
||||||
rsList, err := rsClient.List(context.TODO(), metav1.ListOptions{})
|
rsList, err := rsClient.List(context.TODO(), metav1.ListOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false, fmt.Errorf("failed to list rs: %v", err)
|
return false, fmt.Errorf("failed to list rs: %v", err)
|
||||||
}
|
}
|
||||||
return len(rsList.Items) > 0, nil
|
if len(rsList.Items) > 0 {
|
||||||
|
replicaset = rsList.Items[0]
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
return false, nil
|
||||||
|
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
framework.Failf("Failed to wait for the Deployment to create some ReplicaSet: %v", err)
|
framework.Failf("Failed to wait for the Deployment to create some ReplicaSet: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
desiredGeneration := replicaset.Generation
|
||||||
|
if err := wait.PollImmediate(100*time.Millisecond, 60*time.Second, func() (bool, error) {
|
||||||
|
newRS, err := clientSet.AppsV1().ReplicaSets(replicaset.Namespace).Get(context.TODO(), replicaset.Name, metav1.GetOptions{})
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
return newRS.Status.ObservedGeneration >= desiredGeneration && newRS.Status.Replicas == *replicaset.Spec.Replicas, nil
|
||||||
|
}); err != nil {
|
||||||
|
framework.Failf("failed to verify .Status.Replicas is equal to .Spec.Replicas for replicaset %q: %v", replicaset.Name, err)
|
||||||
|
}
|
||||||
|
|
||||||
ginkgo.By("delete the deployment")
|
ginkgo.By("delete the deployment")
|
||||||
deleteOptions := getOrphanOptions()
|
deleteOptions := getOrphanOptions()
|
||||||
deleteOptions.Preconditions = metav1.NewUIDPreconditions(string(createdDeployment.UID))
|
deleteOptions.Preconditions = metav1.NewUIDPreconditions(string(createdDeployment.UID))
|
||||||
|
Loading…
Reference in New Issue
Block a user