Skip to content

Commit 4e9dd8f

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#89454 from gavinfish/import-aliases
Update .import-aliases for e2e test framework
2 parents 5317a31 + dfab6b6 commit 4e9dd8f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+713
-702
lines changed

‎hack/.import-aliases‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,34 @@
5151
"k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1": "kubeletstatsv1alpha1",
5252
"k8s.io/kubernetes/pkg/proxy/apis/config/v1alpha1": "proxyconfigv1alpha1",
5353
"k8s.io/kubernetes/pkg/scheduler/apis/config/v1alpha1": "schedulerconfigv1alpha1",
54+
"k8s.io/kubernetes/test/e2e/framework/auth": "e2eauth",
5455
"k8s.io/kubernetes/test/e2e/framework/autoscaling": "e2eautoscaling",
56+
"k8s.io/kubernetes/test/e2e/framework/config": "e2econfig",
57+
"k8s.io/kubernetes/test/e2e/framework/deployment": "e2edeployment",
5558
"k8s.io/kubernetes/test/e2e/framework/endpoints": "e2eendpoints",
5659
"k8s.io/kubernetes/test/e2e/framework/events": "e2eevents",
60+
"k8s.io/kubernetes/test/e2e/framework/ginkgowrapper": "e2eginkgowrapper",
61+
"k8s.io/kubernetes/test/e2e/framework/gpu": "e2egpu",
62+
"k8s.io/kubernetes/test/e2e/framework/ingress": "e2eingress",
5763
"k8s.io/kubernetes/test/e2e/framework/job": "e2ejob",
5864
"k8s.io/kubernetes/test/e2e/framework/kubectl": "e2ekubectl",
5965
"k8s.io/kubernetes/test/e2e/framework/kubelet": "e2ekubelet",
6066
"k8s.io/kubernetes/test/e2e/framework/log": "e2elog",
67+
"k8s.io/kubernetes/test/e2e/framework/metrics": "e2emetrics",
6168
"k8s.io/kubernetes/test/e2e/framework/network": "e2enetwork",
6269
"k8s.io/kubernetes/test/e2e/framework/node": "e2enode",
6370
"k8s.io/kubernetes/test/e2e/framework/perf": "e2eperf",
6471
"k8s.io/kubernetes/test/e2e/framework/pod": "e2epod",
6572
"k8s.io/kubernetes/test/e2e/framework/pv": "e2epv",
6673
"k8s.io/kubernetes/test/e2e/framework/rc": "e2erc",
74+
"k8s.io/kubernetes/test/e2e/framework/replicaset": "e2ereplicaset",
6775
"k8s.io/kubernetes/test/e2e/framework/resource": "e2eresource",
6876
"k8s.io/kubernetes/test/e2e/framework/security": "e2esecurity",
6977
"k8s.io/kubernetes/test/e2e/framework/service": "e2eservice",
7078
"k8s.io/kubernetes/test/e2e/framework/skipper": "e2eskipper",
71-
"k8s.io/kubernetes/test/e2e/framework/ssh": "e2essh"
79+
"k8s.io/kubernetes/test/e2e/framework/ssh": "e2essh",
80+
"k8s.io/kubernetes/test/e2e/framework/statefulset": "e2estatefulset",
81+
"k8s.io/kubernetes/test/e2e/framework/testfiles": "e2etestfiles",
82+
"k8s.io/kubernetes/test/e2e/framework/timer": "e2etimer",
83+
"k8s.io/kubernetes/test/e2e/framework/volume": "e2evolume"
7284
}

‎test/e2e/apimachinery/aggregator.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import (
4242
aggregatorclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
4343
rbacv1helpers "k8s.io/kubernetes/pkg/apis/rbac/v1"
4444
"k8s.io/kubernetes/test/e2e/framework"
45-
e2edeploy "k8s.io/kubernetes/test/e2e/framework/deployment"
45+
e2edeployment "k8s.io/kubernetes/test/e2e/framework/deployment"
4646
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
4747
imageutils "k8s.io/kubernetes/test/utils/image"
4848
samplev1alpha1 "k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1"
@@ -274,9 +274,9 @@ func TestSampleAPIServer(f *framework.Framework, aggrclient *aggregatorclient.Cl
274274
}
275275
deployment, err := client.AppsV1().Deployments(namespace).Create(context.TODO(), d, metav1.CreateOptions{})
276276
framework.ExpectNoError(err, "creating deployment %s in namespace %s", deploymentName, namespace)
277-
err = e2edeploy.WaitForDeploymentRevisionAndImage(client, namespace, deploymentName, "1", image)
277+
err = e2edeployment.WaitForDeploymentRevisionAndImage(client, namespace, deploymentName, "1", image)
278278
framework.ExpectNoError(err, "waiting for the deployment of image %s in %s in %s to complete", image, deploymentName, namespace)
279-
err = e2edeploy.WaitForDeploymentRevisionAndImage(client, namespace, deploymentName, "1", etcdImage)
279+
err = e2edeployment.WaitForDeploymentRevisionAndImage(client, namespace, deploymentName, "1", etcdImage)
280280
framework.ExpectNoError(err, "waiting for the deployment of image %s in %s to complete", etcdImage, deploymentName, namespace)
281281

282282
// kubectl create -f service.yaml
@@ -333,7 +333,7 @@ func TestSampleAPIServer(f *framework.Framework, aggrclient *aggregatorclient.Cl
333333
// kubectl get deployments -n <aggregated-api-namespace> && status == Running
334334
// NOTE: aggregated apis should generally be set up in their own namespace (<aggregated-api-namespace>). As the test framework
335335
// is setting up a new namespace, we are just using that.
336-
err = e2edeploy.WaitForDeploymentComplete(client, deployment)
336+
err = e2edeployment.WaitForDeploymentComplete(client, deployment)
337337
framework.ExpectNoError(err, "deploying extension apiserver in namespace %s", namespace)
338338

339339
// kubectl create -f apiservice.yaml

‎test/e2e/apimachinery/crd_conversion_webhook.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
"k8s.io/client-go/dynamic"
3636
clientset "k8s.io/client-go/kubernetes"
3737
"k8s.io/kubernetes/test/e2e/framework"
38-
e2edeploy "k8s.io/kubernetes/test/e2e/framework/deployment"
38+
e2edeployment "k8s.io/kubernetes/test/e2e/framework/deployment"
3939
"k8s.io/kubernetes/test/utils/crd"
4040
imageutils "k8s.io/kubernetes/test/utils/image"
4141
"k8s.io/utils/pointer"
@@ -339,9 +339,9 @@ func deployCustomResourceWebhookAndService(f *framework.Framework, image string,
339339
deployment, err := client.AppsV1().Deployments(namespace).Create(context.TODO(), d, metav1.CreateOptions{})
340340
framework.ExpectNoError(err, "creating deployment %s in namespace %s", deploymentCRDName, namespace)
341341
ginkgo.By("Wait for the deployment to be ready")
342-
err = e2edeploy.WaitForDeploymentRevisionAndImage(client, namespace, deploymentCRDName, "1", image)
342+
err = e2edeployment.WaitForDeploymentRevisionAndImage(client, namespace, deploymentCRDName, "1", image)
343343
framework.ExpectNoError(err, "waiting for the deployment of image %s in %s in %s to complete", image, deploymentName, namespace)
344-
err = e2edeploy.WaitForDeploymentComplete(client, deployment)
344+
err = e2edeployment.WaitForDeploymentComplete(client, deployment)
345345
framework.ExpectNoError(err, "waiting for the deployment status valid", image, deploymentCRDName, namespace)
346346

347347
ginkgo.By("Deploying the webhook service")

‎test/e2e/apimachinery/webhook.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import (
4242
clientset "k8s.io/client-go/kubernetes"
4343
"k8s.io/client-go/util/retry"
4444
"k8s.io/kubernetes/test/e2e/framework"
45-
e2edeploy "k8s.io/kubernetes/test/e2e/framework/deployment"
45+
e2edeployment "k8s.io/kubernetes/test/e2e/framework/deployment"
4646
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
4747
"k8s.io/kubernetes/test/utils/crd"
4848
imageutils "k8s.io/kubernetes/test/utils/image"
@@ -840,9 +840,9 @@ func deployWebhookAndService(f *framework.Framework, image string, certCtx *cert
840840
deployment, err := client.AppsV1().Deployments(namespace).Create(context.TODO(), d, metav1.CreateOptions{})
841841
framework.ExpectNoError(err, "creating deployment %s in namespace %s", deploymentName, namespace)
842842
ginkgo.By("Wait for the deployment to be ready")
843-
err = e2edeploy.WaitForDeploymentRevisionAndImage(client, namespace, deploymentName, "1", image)
843+
err = e2edeployment.WaitForDeploymentRevisionAndImage(client, namespace, deploymentName, "1", image)
844844
framework.ExpectNoError(err, "waiting for the deployment of image %s in %s in %s to complete", image, deploymentName, namespace)
845-
err = e2edeploy.WaitForDeploymentComplete(client, deployment)
845+
err = e2edeployment.WaitForDeploymentComplete(client, deployment)
846846
framework.ExpectNoError(err, "waiting for the deployment status valid", image, deploymentName, namespace)
847847

848848
ginkgo.By("Deploying the webhook service")

0 commit comments

Comments
 (0)