From 77a9d4772b7b555860da43ca8eb6269e88149cc9 Mon Sep 17 00:00:00 2001 From: tanjunchen <2799194073@qq.com> Date: Fri, 13 Dec 2019 13:02:02 +0800 Subject: [PATCH] move funcs from test/e2e/framework/replicaset to test/e2e/apps --- test/e2e/apps/BUILD | 1 + test/e2e/apps/deployment.go | 47 +++++++++++++++++++++++---- test/e2e/framework/replicaset/BUILD | 1 - test/e2e/framework/replicaset/wait.go | 33 ------------------- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/test/e2e/apps/BUILD b/test/e2e/apps/BUILD index 1878821ad36..8d5b82335c5 100644 --- a/test/e2e/apps/BUILD +++ b/test/e2e/apps/BUILD @@ -57,6 +57,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library", + "//staging/src/k8s.io/client-go/kubernetes/typed/apps/v1:go_default_library", "//staging/src/k8s.io/client-go/tools/cache:go_default_library", "//staging/src/k8s.io/client-go/tools/watch:go_default_library", "//staging/src/k8s.io/client-go/util/retry:go_default_library", diff --git a/test/e2e/apps/deployment.go b/test/e2e/apps/deployment.go index 26a06ba285f..e0f7a092b99 100644 --- a/test/e2e/apps/deployment.go +++ b/test/e2e/apps/deployment.go @@ -27,7 +27,7 @@ import ( "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -37,6 +37,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" clientset "k8s.io/client-go/kubernetes" + appsclient "k8s.io/client-go/kubernetes/typed/apps/v1" watchtools "k8s.io/client-go/tools/watch" appsinternal "k8s.io/kubernetes/pkg/apis/apps" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" @@ -757,14 +758,14 @@ func testProportionalScalingDeployment(f *framework.Framework) { // First rollout's replicaset should have .spec.replicas = 8 too. framework.Logf("Waiting for the first rollout's replicaset to have .spec.replicas = %d", minAvailableReplicas) - err = replicaset.WaitForReplicaSetTargetSpecReplicas(c, firstRS, minAvailableReplicas) + err = waitForReplicaSetTargetSpecReplicas(c, firstRS, minAvailableReplicas) framework.ExpectNoError(err) // The desired replicas wait makes sure that the RS controller has created expected number of pods. framework.Logf("Waiting for the first rollout's replicaset of deployment %q to have desired number of replicas", deploymentName) firstRS, err = c.AppsV1().ReplicaSets(ns).Get(firstRS.Name, metav1.GetOptions{}) framework.ExpectNoError(err) - err = replicaset.WaitForReplicaSetDesiredReplicas(c.AppsV1(), firstRS) + err = waitForReplicaSetDesiredReplicas(c.AppsV1(), firstRS) framework.ExpectNoError(err) // Checking state of second rollout's replicaset. @@ -781,14 +782,14 @@ func testProportionalScalingDeployment(f *framework.Framework) { // Second rollout's replicaset should have Deployment's (replicas + maxSurge - first RS's replicas) = 10 + 3 - 8 = 5 for .spec.replicas. newReplicas := replicas + int32(maxSurge) - minAvailableReplicas framework.Logf("Waiting for the second rollout's replicaset to have .spec.replicas = %d", newReplicas) - err = replicaset.WaitForReplicaSetTargetSpecReplicas(c, secondRS, newReplicas) + err = waitForReplicaSetTargetSpecReplicas(c, secondRS, newReplicas) framework.ExpectNoError(err) // The desired replicas wait makes sure that the RS controller has created expected number of pods. framework.Logf("Waiting for the second rollout's replicaset of deployment %q to have desired number of replicas", deploymentName) secondRS, err = c.AppsV1().ReplicaSets(ns).Get(secondRS.Name, metav1.GetOptions{}) framework.ExpectNoError(err) - err = replicaset.WaitForReplicaSetDesiredReplicas(c.AppsV1(), secondRS) + err = waitForReplicaSetDesiredReplicas(c.AppsV1(), secondRS) framework.ExpectNoError(err) // Check the deployment's minimum availability. @@ -815,13 +816,13 @@ func testProportionalScalingDeployment(f *framework.Framework) { // First rollout's replicaset should have .spec.replicas = 8 + (30-10)*(8/13) = 8 + 12 = 20 replicas. // Note that 12 comes from rounding (30-10)*(8/13) to nearest integer. framework.Logf("Verifying that first rollout's replicaset has .spec.replicas = 20") - err = replicaset.WaitForReplicaSetTargetSpecReplicas(c, firstRS, 20) + err = waitForReplicaSetTargetSpecReplicas(c, firstRS, 20) framework.ExpectNoError(err) // Second rollout's replicaset should have .spec.replicas = 5 + (30-10)*(5/13) = 5 + 8 = 13 replicas. // Note that 8 comes from rounding (30-10)*(5/13) to nearest integer. framework.Logf("Verifying that second rollout's replicaset has .spec.replicas = 13") - err = replicaset.WaitForReplicaSetTargetSpecReplicas(c, secondRS, 13) + err = waitForReplicaSetTargetSpecReplicas(c, secondRS, 13) framework.ExpectNoError(err) } @@ -1089,3 +1090,35 @@ func waitForDeploymentOldRSsNum(c clientset.Interface, ns, deploymentName string } return pollErr } + +// waitForReplicaSetDesiredReplicas waits until the replicaset has desired number of replicas. +func waitForReplicaSetDesiredReplicas(rsClient appsclient.ReplicaSetsGetter, replicaSet *appsv1.ReplicaSet) error { + desiredGeneration := replicaSet.Generation + err := wait.PollImmediate(framework.Poll, framework.PollShortTimeout, func() (bool, error) { + rs, err := rsClient.ReplicaSets(replicaSet.Namespace).Get(replicaSet.Name, metav1.GetOptions{}) + if err != nil { + return false, err + } + return rs.Status.ObservedGeneration >= desiredGeneration && rs.Status.Replicas == *(replicaSet.Spec.Replicas) && rs.Status.Replicas == *(rs.Spec.Replicas), nil + }) + if err == wait.ErrWaitTimeout { + err = fmt.Errorf("replicaset %q never had desired number of replicas", replicaSet.Name) + } + return err +} + +// waitForReplicaSetTargetSpecReplicas waits for .spec.replicas of a RS to equal targetReplicaNum +func waitForReplicaSetTargetSpecReplicas(c clientset.Interface, replicaSet *appsv1.ReplicaSet, targetReplicaNum int32) error { + desiredGeneration := replicaSet.Generation + err := wait.PollImmediate(framework.Poll, framework.PollShortTimeout, func() (bool, error) { + rs, err := c.AppsV1().ReplicaSets(replicaSet.Namespace).Get(replicaSet.Name, metav1.GetOptions{}) + if err != nil { + return false, err + } + return rs.Status.ObservedGeneration >= desiredGeneration && *rs.Spec.Replicas == targetReplicaNum, nil + }) + if err == wait.ErrWaitTimeout { + err = fmt.Errorf("replicaset %q never had desired number of .spec.replicas", replicaSet.Name) + } + return err +} diff --git a/test/e2e/framework/replicaset/BUILD b/test/e2e/framework/replicaset/BUILD index ce80cc75478..0e3e70badf7 100644 --- a/test/e2e/framework/replicaset/BUILD +++ b/test/e2e/framework/replicaset/BUILD @@ -15,7 +15,6 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", - "//staging/src/k8s.io/client-go/kubernetes/typed/apps/v1:go_default_library", "//test/e2e/framework:go_default_library", "//test/e2e/framework/kubectl:go_default_library", "//test/utils:go_default_library", diff --git a/test/e2e/framework/replicaset/wait.go b/test/e2e/framework/replicaset/wait.go index 0428b07c75e..c004d3a2960 100644 --- a/test/e2e/framework/replicaset/wait.go +++ b/test/e2e/framework/replicaset/wait.go @@ -24,7 +24,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" - appsclient "k8s.io/client-go/kubernetes/typed/apps/v1" "k8s.io/kubernetes/test/e2e/framework" e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl" testutils "k8s.io/kubernetes/test/utils" @@ -53,38 +52,6 @@ func WaitForReadyReplicaSet(c clientset.Interface, ns, name string) error { return err } -// WaitForReplicaSetDesiredReplicas waits until the replicaset has desired number of replicas. -func WaitForReplicaSetDesiredReplicas(rsClient appsclient.ReplicaSetsGetter, replicaSet *appsv1.ReplicaSet) error { - desiredGeneration := replicaSet.Generation - err := wait.PollImmediate(framework.Poll, framework.PollShortTimeout, func() (bool, error) { - rs, err := rsClient.ReplicaSets(replicaSet.Namespace).Get(replicaSet.Name, metav1.GetOptions{}) - if err != nil { - return false, err - } - return rs.Status.ObservedGeneration >= desiredGeneration && rs.Status.Replicas == *(replicaSet.Spec.Replicas) && rs.Status.Replicas == *(rs.Spec.Replicas), nil - }) - if err == wait.ErrWaitTimeout { - err = fmt.Errorf("replicaset %q never had desired number of replicas", replicaSet.Name) - } - return err -} - -// WaitForReplicaSetTargetSpecReplicas waits for .spec.replicas of a RS to equal targetReplicaNum -func WaitForReplicaSetTargetSpecReplicas(c clientset.Interface, replicaSet *appsv1.ReplicaSet, targetReplicaNum int32) error { - desiredGeneration := replicaSet.Generation - err := wait.PollImmediate(framework.Poll, framework.PollShortTimeout, func() (bool, error) { - rs, err := c.AppsV1().ReplicaSets(replicaSet.Namespace).Get(replicaSet.Name, metav1.GetOptions{}) - if err != nil { - return false, err - } - return rs.Status.ObservedGeneration >= desiredGeneration && *rs.Spec.Replicas == targetReplicaNum, nil - }) - if err == wait.ErrWaitTimeout { - err = fmt.Errorf("replicaset %q never had desired number of .spec.replicas", replicaSet.Name) - } - return err -} - // WaitForReplicaSetTargetAvailableReplicas waits for .status.availableReplicas of a RS to equal targetReplicaNum func WaitForReplicaSetTargetAvailableReplicas(c clientset.Interface, replicaSet *appsv1.ReplicaSet, targetReplicaNum int32) error { desiredGeneration := replicaSet.Generation