Update .import-aliases for e2e test framework

Author: gavinfish

hack/.import-aliases

@@ -51,22 +51,34 @@
   "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1": "kubeletstatsv1alpha1",
   "k8s.io/kubernetes/pkg/proxy/apis/config/v1alpha1": "proxyconfigv1alpha1",
   "k8s.io/kubernetes/pkg/scheduler/apis/config/v1alpha1": "schedulerconfigv1alpha1",
+  "k8s.io/kubernetes/test/e2e/framework/auth": "e2eauth",
   "k8s.io/kubernetes/test/e2e/framework/autoscaling": "e2eautoscaling",
+  "k8s.io/kubernetes/test/e2e/framework/config": "e2econfig",
+  "k8s.io/kubernetes/test/e2e/framework/deployment": "e2edeployment",
   "k8s.io/kubernetes/test/e2e/framework/endpoints": "e2eendpoints",
   "k8s.io/kubernetes/test/e2e/framework/events": "e2eevents",
+  "k8s.io/kubernetes/test/e2e/framework/ginkgowrapper": "e2eginkgowrapper",
+  "k8s.io/kubernetes/test/e2e/framework/gpu": "e2egpu",
+  "k8s.io/kubernetes/test/e2e/framework/ingress": "e2eingress",
   "k8s.io/kubernetes/test/e2e/framework/job": "e2ejob",
   "k8s.io/kubernetes/test/e2e/framework/kubectl": "e2ekubectl",
   "k8s.io/kubernetes/test/e2e/framework/kubelet": "e2ekubelet",
   "k8s.io/kubernetes/test/e2e/framework/log": "e2elog",
+  "k8s.io/kubernetes/test/e2e/framework/metrics": "e2emetrics",
   "k8s.io/kubernetes/test/e2e/framework/network": "e2enetwork",
   "k8s.io/kubernetes/test/e2e/framework/node": "e2enode",
   "k8s.io/kubernetes/test/e2e/framework/perf": "e2eperf",
   "k8s.io/kubernetes/test/e2e/framework/pod": "e2epod",
   "k8s.io/kubernetes/test/e2e/framework/pv": "e2epv",
   "k8s.io/kubernetes/test/e2e/framework/rc": "e2erc",
+  "k8s.io/kubernetes/test/e2e/framework/replicaset": "e2ereplicaset",
   "k8s.io/kubernetes/test/e2e/framework/resource": "e2eresource",
   "k8s.io/kubernetes/test/e2e/framework/security": "e2esecurity",
   "k8s.io/kubernetes/test/e2e/framework/service": "e2eservice",
   "k8s.io/kubernetes/test/e2e/framework/skipper": "e2eskipper",
-  "k8s.io/kubernetes/test/e2e/framework/ssh": "e2essh"
+  "k8s.io/kubernetes/test/e2e/framework/ssh": "e2essh",
+  "k8s.io/kubernetes/test/e2e/framework/statefulset": "e2estatefulset",
+  "k8s.io/kubernetes/test/e2e/framework/testfiles": "e2etestfiles",
+  "k8s.io/kubernetes/test/e2e/framework/timer": "e2etimer",
+  "k8s.io/kubernetes/test/e2e/framework/volume": "e2evolume"
 }

test/e2e/apimachinery/aggregator.go

@@ -42,7 +42,7 @@ import (
 	aggregatorclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
 	rbacv1helpers "k8s.io/kubernetes/pkg/apis/rbac/v1"
 	"k8s.io/kubernetes/test/e2e/framework"
-	e2edeploy "k8s.io/kubernetes/test/e2e/framework/deployment"
+	e2edeployment "k8s.io/kubernetes/test/e2e/framework/deployment"
 	e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
 	imageutils "k8s.io/kubernetes/test/utils/image"
 	samplev1alpha1 "k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1"
@@ -274,9 +274,9 @@ func TestSampleAPIServer(f *framework.Framework, aggrclient *aggregatorclient.Cl
 	}
 	deployment, err := client.AppsV1().Deployments(namespace).Create(context.TODO(), d, metav1.CreateOptions{})
 	framework.ExpectNoError(err, "creating deployment %s in namespace %s", deploymentName, namespace)
-	err = e2edeploy.WaitForDeploymentRevisionAndImage(client, namespace, deploymentName, "1", image)
+	err = e2edeployment.WaitForDeploymentRevisionAndImage(client, namespace, deploymentName, "1", image)
 	framework.ExpectNoError(err, "waiting for the deployment of image %s in %s in %s to complete", image, deploymentName, namespace)
-	err = e2edeploy.WaitForDeploymentRevisionAndImage(client, namespace, deploymentName, "1", etcdImage)
+	err = e2edeployment.WaitForDeploymentRevisionAndImage(client, namespace, deploymentName, "1", etcdImage)
 	framework.ExpectNoError(err, "waiting for the deployment of image %s in %s to complete", etcdImage, deploymentName, namespace)
 
 	// kubectl create -f service.yaml
@@ -333,7 +333,7 @@ func TestSampleAPIServer(f *framework.Framework, aggrclient *aggregatorclient.Cl
 	// kubectl get deployments -n <aggregated-api-namespace> && status == Running
 	// NOTE: aggregated apis should generally be set up in their own namespace (<aggregated-api-namespace>). As the test framework
 	// is setting up a new namespace, we are just using that.
-	err = e2edeploy.WaitForDeploymentComplete(client, deployment)
+	err = e2edeployment.WaitForDeploymentComplete(client, deployment)
 	framework.ExpectNoError(err, "deploying extension apiserver in namespace %s", namespace)
 
 	// kubectl create -f apiservice.yaml

test/e2e/apimachinery/crd_conversion_webhook.go

@@ -35,7 +35,7 @@ import (
 	"k8s.io/client-go/dynamic"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/kubernetes/test/e2e/framework"
-	e2edeploy "k8s.io/kubernetes/test/e2e/framework/deployment"
+	e2edeployment "k8s.io/kubernetes/test/e2e/framework/deployment"
 	"k8s.io/kubernetes/test/utils/crd"
 	imageutils "k8s.io/kubernetes/test/utils/image"
 	"k8s.io/utils/pointer"
@@ -339,9 +339,9 @@ func deployCustomResourceWebhookAndService(f *framework.Framework, image string,
 	deployment, err := client.AppsV1().Deployments(namespace).Create(context.TODO(), d, metav1.CreateOptions{})
 	framework.ExpectNoError(err, "creating deployment %s in namespace %s", deploymentCRDName, namespace)
 	ginkgo.By("Wait for the deployment to be ready")
-	err = e2edeploy.WaitForDeploymentRevisionAndImage(client, namespace, deploymentCRDName, "1", image)
+	err = e2edeployment.WaitForDeploymentRevisionAndImage(client, namespace, deploymentCRDName, "1", image)
 	framework.ExpectNoError(err, "waiting for the deployment of image %s in %s in %s to complete", image, deploymentName, namespace)
-	err = e2edeploy.WaitForDeploymentComplete(client, deployment)
+	err = e2edeployment.WaitForDeploymentComplete(client, deployment)
 	framework.ExpectNoError(err, "waiting for the deployment status valid", image, deploymentCRDName, namespace)
 
 	ginkgo.By("Deploying the webhook service")

test/e2e/apimachinery/webhook.go

@@ -42,7 +42,7 @@ import (
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/util/retry"
 	"k8s.io/kubernetes/test/e2e/framework"
-	e2edeploy "k8s.io/kubernetes/test/e2e/framework/deployment"
+	e2edeployment "k8s.io/kubernetes/test/e2e/framework/deployment"
 	e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
 	"k8s.io/kubernetes/test/utils/crd"
 	imageutils "k8s.io/kubernetes/test/utils/image"
@@ -840,9 +840,9 @@ func deployWebhookAndService(f *framework.Framework, image string, certCtx *cert
 	deployment, err := client.AppsV1().Deployments(namespace).Create(context.TODO(), d, metav1.CreateOptions{})
 	framework.ExpectNoError(err, "creating deployment %s in namespace %s", deploymentName, namespace)
 	ginkgo.By("Wait for the deployment to be ready")
-	err = e2edeploy.WaitForDeploymentRevisionAndImage(client, namespace, deploymentName, "1", image)
+	err = e2edeployment.WaitForDeploymentRevisionAndImage(client, namespace, deploymentName, "1", image)
 	framework.ExpectNoError(err, "waiting for the deployment of image %s in %s in %s to complete", image, deploymentName, namespace)
-	err = e2edeploy.WaitForDeploymentComplete(client, deployment)
+	err = e2edeployment.WaitForDeploymentComplete(client, deployment)
 	framework.ExpectNoError(err, "waiting for the deployment status valid", image, deploymentName, namespace)
 
 	ginkgo.By("Deploying the webhook service")