github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Revert "test: update rollover test to wait for available rs before adopting"

Browse Source 
This reverts commit 5b7bf78f3f.
This commit is contained in:
Clayton Coleman 2016-12-03 14:42:35 -05:00
parent e15cd67247
commit 7aacb61fe1
No known key found for this signature in database
GPG Key ID: 3D16906B4F1C5CB3
2 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/deployment.go
View File

@ -550,9 +550,6 @@ func testRolloverDeployment(f *framework.Framework) {
framework.Logf("error in waiting for pods to come up: %s", err) framework.Logf("error in waiting for pods to come up: %s", err)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
} }
// Wait for replica set to become fully available before adopting it.
framework.Logf("Waiting for replica set %q to become fully available", rsName)
Expect(framework.WaitForAvailableReplicaSet(c, ns, rsName)).NotTo(HaveOccurred())
// Create a deployment to delete nginx pods and instead bring up redis-slave pods. // Create a deployment to delete nginx pods and instead bring up redis-slave pods.
// We use a nonexistent image here, so that we make sure it won't finish // We use a nonexistent image here, so that we make sure it won't finish

36
test/e2e/framework/util.go
View File

@ -2927,26 +2927,6 @@ func waitForReplicaSetPodsGone(c clientset.Interface, rs *extensions.ReplicaSet)
}) })
} }
// WaitForAvailableReplicaSet waits until the replica set has all of its replicas available
// and is observed by the replica set controller.
func WaitForAvailableReplicaSet(c clientset.Interface, ns, name string) error {
var status extensions.ReplicaSetStatus
err := wait.PollImmediate(Poll, 5*time.Minute, func() (bool, error) {
rs, err := c.Extensions().ReplicaSets(ns).Get(name)
if err != nil {
return false, err
}
status = rs.Status
return rs.Status.ObservedGeneration >= rs.Generation &&
*(rs.Spec.Replicas) == rs.Status.Replicas &&
*(rs.Spec.Replicas) == rs.Status.AvailableReplicas, nil
})
if err == wait.ErrWaitTimeout {
err = fmt.Errorf("replica set %q never became available: %#v", name, status)
}
return err
}
// Waits for the deployment status to become valid (i.e. max unavailable and max surge aren't violated anymore). // Waits for the deployment status to become valid (i.e. max unavailable and max surge aren't violated anymore).
// Note that the status should stay valid at all times unless shortly after a scaling event or the deployment is just created. // Note that the status should stay valid at all times unless shortly after a scaling event or the deployment is just created.
// To verify that the deployment status is valid and wait for the rollout to finish, use WaitForDeploymentStatus instead. // To verify that the deployment status is valid and wait for the rollout to finish, use WaitForDeploymentStatus instead.
@ -2958,7 +2938,7 @@ func WaitForDeploymentStatusValid(c clientset.Interface, d *extensions.Deploymen
reason string reason string
) )
err := wait.PollImmediate(Poll, 5*time.Minute, func() (bool, error) { err := wait.Poll(Poll, 5*time.Minute, func() (bool, error) {
var err error var err error
deployment, err = c.Extensions().Deployments(d.Namespace).Get(d.Name) deployment, err = c.Extensions().Deployments(d.Namespace).Get(d.Name)
if err != nil { if err != nil {
@ -3030,7 +3010,7 @@ func WaitForDeploymentStatus(c clientset.Interface, d *extensions.Deployment) er
deployment *extensions.Deployment deployment *extensions.Deployment
) )
err := wait.PollImmediate(Poll, 5*time.Minute, func() (bool, error) { err := wait.Poll(Poll, 5*time.Minute, func() (bool, error) {
var err error var err error
deployment, err = c.Extensions().Deployments(d.Namespace).Get(d.Name) deployment, err = c.Extensions().Deployments(d.Namespace).Get(d.Name)
if err != nil { if err != nil {
@ -3085,7 +3065,7 @@ func WaitForDeploymentStatus(c clientset.Interface, d *extensions.Deployment) er
// WaitForDeploymentUpdatedReplicasLTE waits for given deployment to be observed by the controller and has at least a number of updatedReplicas // WaitForDeploymentUpdatedReplicasLTE waits for given deployment to be observed by the controller and has at least a number of updatedReplicas
func WaitForDeploymentUpdatedReplicasLTE(c clientset.Interface, ns, deploymentName string, minUpdatedReplicas int, desiredGeneration int64) error { func WaitForDeploymentUpdatedReplicasLTE(c clientset.Interface, ns, deploymentName string, minUpdatedReplicas int, desiredGeneration int64) error {
err := wait.PollImmediate(Poll, 5*time.Minute, func() (bool, error) { err := wait.Poll(Poll, 5*time.Minute, func() (bool, error) {
deployment, err := c.Extensions().Deployments(ns).Get(deploymentName) deployment, err := c.Extensions().Deployments(ns).Get(deploymentName)
if err != nil { if err != nil {
return false, err return false, err
@ -3104,7 +3084,7 @@ func WaitForDeploymentUpdatedReplicasLTE(c clientset.Interface, ns, deploymentNa
// WaitForDeploymentRollbackCleared waits for given deployment either started rolling back or doesn't need to rollback. // WaitForDeploymentRollbackCleared waits for given deployment either started rolling back or doesn't need to rollback.
// Note that rollback should be cleared shortly, so we only wait for 1 minute here to fail early. // Note that rollback should be cleared shortly, so we only wait for 1 minute here to fail early.
func WaitForDeploymentRollbackCleared(c clientset.Interface, ns, deploymentName string) error { func WaitForDeploymentRollbackCleared(c clientset.Interface, ns, deploymentName string) error {
err := wait.PollImmediate(Poll, 1*time.Minute, func() (bool, error) { err := wait.Poll(Poll, 1*time.Minute, func() (bool, error) {
deployment, err := c.Extensions().Deployments(ns).Get(deploymentName) deployment, err := c.Extensions().Deployments(ns).Get(deploymentName)
if err != nil { if err != nil {
return false, err return false, err
@ -3126,7 +3106,7 @@ func WaitForDeploymentRollbackCleared(c clientset.Interface, ns, deploymentName
func WaitForDeploymentRevisionAndImage(c clientset.Interface, ns, deploymentName string, revision, image string) error { func WaitForDeploymentRevisionAndImage(c clientset.Interface, ns, deploymentName string, revision, image string) error {
var deployment *extensions.Deployment var deployment *extensions.Deployment
var newRS *extensions.ReplicaSet var newRS *extensions.ReplicaSet
err := wait.PollImmediate(Poll, 1*time.Minute, func() (bool, error) { err := wait.Poll(Poll, 1*time.Minute, func() (bool, error) {
var err error var err error
deployment, err = c.Extensions().Deployments(ns).Get(deploymentName) deployment, err = c.Extensions().Deployments(ns).Get(deploymentName)
if err != nil { if err != nil {
@ -3158,7 +3138,7 @@ func WaitForDeploymentRevisionAndImage(c clientset.Interface, ns, deploymentName
} }
func WaitForOverlappingAnnotationMatch(c clientset.Interface, ns, deploymentName, expected string) error { func WaitForOverlappingAnnotationMatch(c clientset.Interface, ns, deploymentName, expected string) error {
return wait.PollImmediate(Poll, 1*time.Minute, func() (bool, error) { return wait.Poll(Poll, 1*time.Minute, func() (bool, error) {
deployment, err := c.Extensions().Deployments(ns).Get(deploymentName) deployment, err := c.Extensions().Deployments(ns).Get(deploymentName)
if err != nil { if err != nil {
return false, err return false, err
@ -3192,7 +3172,7 @@ func CheckNewRSAnnotations(c clientset.Interface, ns, deploymentName string, exp
func WaitForPodsReady(c clientset.Interface, ns, name string, minReadySeconds int) error { func WaitForPodsReady(c clientset.Interface, ns, name string, minReadySeconds int) error {
label := labels.SelectorFromSet(labels.Set(map[string]string{"name": name})) label := labels.SelectorFromSet(labels.Set(map[string]string{"name": name}))
options := v1.ListOptions{LabelSelector: label.String()} options := v1.ListOptions{LabelSelector: label.String()}
return wait.PollImmediate(Poll, 5*time.Minute, func() (bool, error) { return wait.Poll(Poll, 5*time.Minute, func() (bool, error) {
pods, err := c.Core().Pods(ns).List(options) pods, err := c.Core().Pods(ns).List(options)
if err != nil { if err != nil {
return false, nil return false, nil
@ -3208,7 +3188,7 @@ func WaitForPodsReady(c clientset.Interface, ns, name string, minReadySeconds in
// Waits for the deployment to clean up old rcs. // Waits for the deployment to clean up old rcs.
func WaitForDeploymentOldRSsNum(c clientset.Interface, ns, deploymentName string, desiredRSNum int) error { func WaitForDeploymentOldRSsNum(c clientset.Interface, ns, deploymentName string, desiredRSNum int) error {
return wait.PollImmediate(Poll, 5*time.Minute, func() (bool, error) { return wait.Poll(Poll, 5*time.Minute, func() (bool, error) {
deployment, err := c.Extensions().Deployments(ns).Get(deploymentName) deployment, err := c.Extensions().Deployments(ns).Get(deploymentName)
if err != nil { if err != nil {
return false, err return false, err