diff --git a/test/e2e/framework/replicaset/BUILD b/test/e2e/framework/replicaset/BUILD index 809acfa2be6..f16ef666638 100644 --- a/test/e2e/framework/replicaset/BUILD +++ b/test/e2e/framework/replicaset/BUILD @@ -10,7 +10,6 @@ go_library( importpath = "k8s.io/kubernetes/test/e2e/framework/replicaset", visibility = ["//visibility:public"], deps = [ - "//pkg/controller/deployment/util:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/test/e2e/framework/replicaset/rest.go b/test/e2e/framework/replicaset/rest.go index afd77965907..e752a9578cd 100644 --- a/test/e2e/framework/replicaset/rest.go +++ b/test/e2e/framework/replicaset/rest.go @@ -17,12 +17,8 @@ limitations under the License. package replicaset import ( - "fmt" - appsv1 "k8s.io/api/apps/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" - deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/test/e2e/framework" testutils "k8s.io/kubernetes/test/utils" ) @@ -31,22 +27,3 @@ import ( func UpdateReplicaSetWithRetries(c clientset.Interface, namespace, name string, applyUpdate testutils.UpdateReplicaSetFunc) (*appsv1.ReplicaSet, error) { return testutils.UpdateReplicaSetWithRetries(c, namespace, name, applyUpdate, framework.Logf, framework.Poll, framework.PollShortTimeout) } - -// CheckNewRSAnnotations check if the new RS's annotation is as expected -func CheckNewRSAnnotations(c clientset.Interface, ns, deploymentName string, expectedAnnotations map[string]string) error { - deployment, err := c.AppsV1().Deployments(ns).Get(deploymentName, metav1.GetOptions{}) - if err != nil { - return err - } - newRS, err := deploymentutil.GetNewReplicaSet(deployment, c.AppsV1()) - if err != nil { - return err - } - for k, v := range expectedAnnotations { - // Skip checking revision annotations - if k != deploymentutil.RevisionAnnotation && v != newRS.Annotations[k] { - return fmt.Errorf("Expected new RS annotations = %+v, got %+v", expectedAnnotations, newRS.Annotations) - } - } - return nil -}