diff --git a/hack/.import-aliases b/hack/.import-aliases index 09d5f86e2d5..426a63c38fb 100644 --- a/hack/.import-aliases +++ b/hack/.import-aliases @@ -16,5 +16,6 @@ "k8s.io/api/coordination/v1": "coordinationv1", "k8s.io/api/coordination/v1beta1": "coordinationv1beta1", "k8s.io/api/core/v1": "v1", - "k8s.io/api/events/v1beta1": "eventsv1beta1" + "k8s.io/api/events/v1beta1": "eventsv1beta1", + "k8s.io/api/extensions/v1beta1": "extensionsv1beta1" } \ No newline at end of file diff --git a/test/e2e/apps/deployment.go b/test/e2e/apps/deployment.go index 9ff900201ad..763183e4498 100644 --- a/test/e2e/apps/deployment.go +++ b/test/e2e/apps/deployment.go @@ -27,7 +27,7 @@ import ( appsv1 "k8s.io/api/apps/v1" "k8s.io/api/core/v1" - extensions "k8s.io/api/extensions/v1beta1" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -182,11 +182,11 @@ func intOrStrP(num int) *intstr.IntOrString { return &intstr } -func newDeploymentRollback(name string, annotations map[string]string, revision int64) *extensions.DeploymentRollback { - return &extensions.DeploymentRollback{ +func newDeploymentRollback(name string, annotations map[string]string, revision int64) *extensionsv1beta1.DeploymentRollback { + return &extensionsv1beta1.DeploymentRollback{ Name: name, UpdatedAnnotations: annotations, - RollbackTo: extensions.RollbackConfig{Revision: revision}, + RollbackTo: extensionsv1beta1.RollbackConfig{Revision: revision}, } } diff --git a/test/e2e/framework/pod/runtimeobject.go b/test/e2e/framework/pod/runtimeobject.go index 816f4c08b3b..e6e5100da40 100644 --- a/test/e2e/framework/pod/runtimeobject.go +++ b/test/e2e/framework/pod/runtimeobject.go @@ -22,7 +22,7 @@ import ( appsv1 "k8s.io/api/apps/v1" batchv1 "k8s.io/api/batch/v1" v1 "k8s.io/api/core/v1" - extensions "k8s.io/api/extensions/v1beta1" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -59,15 +59,15 @@ func getSelectorFromRuntimeObject(obj runtime.Object) (labels.Selector, error) { switch typed := obj.(type) { case *v1.ReplicationController: return labels.SelectorFromSet(typed.Spec.Selector), nil - case *extensions.ReplicaSet: + case *extensionsv1beta1.ReplicaSet: return metav1.LabelSelectorAsSelector(typed.Spec.Selector) case *appsv1.ReplicaSet: return metav1.LabelSelectorAsSelector(typed.Spec.Selector) - case *extensions.Deployment: + case *extensionsv1beta1.Deployment: return metav1.LabelSelectorAsSelector(typed.Spec.Selector) case *appsv1.Deployment: return metav1.LabelSelectorAsSelector(typed.Spec.Selector) - case *extensions.DaemonSet: + case *extensionsv1beta1.DaemonSet: return metav1.LabelSelectorAsSelector(typed.Spec.Selector) case *appsv1.DaemonSet: return metav1.LabelSelectorAsSelector(typed.Spec.Selector) @@ -87,7 +87,7 @@ func getReplicasFromRuntimeObject(obj runtime.Object) (int32, error) { return *typed.Spec.Replicas, nil } return 0, nil - case *extensions.ReplicaSet: + case *extensionsv1beta1.ReplicaSet: if typed.Spec.Replicas != nil { return *typed.Spec.Replicas, nil } @@ -97,7 +97,7 @@ func getReplicasFromRuntimeObject(obj runtime.Object) (int32, error) { return *typed.Spec.Replicas, nil } return 0, nil - case *extensions.Deployment: + case *extensionsv1beta1.Deployment: if typed.Spec.Replicas != nil { return *typed.Spec.Replicas, nil } @@ -107,7 +107,7 @@ func getReplicasFromRuntimeObject(obj runtime.Object) (int32, error) { return *typed.Spec.Replicas, nil } return 0, nil - case *extensions.DaemonSet: + case *extensionsv1beta1.DaemonSet: return 0, nil case *appsv1.DaemonSet: return 0, nil diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index adbf93ee427..5e1345a1467 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -50,7 +50,7 @@ import ( appsv1 "k8s.io/api/apps/v1" batchv1 "k8s.io/api/batch/v1" v1 "k8s.io/api/core/v1" - extensions "k8s.io/api/extensions/v1beta1" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" apierrs "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" @@ -2247,15 +2247,15 @@ func getSelectorFromRuntimeObject(obj runtime.Object) (labels.Selector, error) { switch typed := obj.(type) { case *v1.ReplicationController: return labels.SelectorFromSet(typed.Spec.Selector), nil - case *extensions.ReplicaSet: + case *extensionsv1beta1.ReplicaSet: return metav1.LabelSelectorAsSelector(typed.Spec.Selector) case *appsv1.ReplicaSet: return metav1.LabelSelectorAsSelector(typed.Spec.Selector) - case *extensions.Deployment: + case *extensionsv1beta1.Deployment: return metav1.LabelSelectorAsSelector(typed.Spec.Selector) case *appsv1.Deployment: return metav1.LabelSelectorAsSelector(typed.Spec.Selector) - case *extensions.DaemonSet: + case *extensionsv1beta1.DaemonSet: return metav1.LabelSelectorAsSelector(typed.Spec.Selector) case *appsv1.DaemonSet: return metav1.LabelSelectorAsSelector(typed.Spec.Selector) @@ -2273,7 +2273,7 @@ func getReplicasFromRuntimeObject(obj runtime.Object) (int32, error) { return *typed.Spec.Replicas, nil } return 0, nil - case *extensions.ReplicaSet: + case *extensionsv1beta1.ReplicaSet: if typed.Spec.Replicas != nil { return *typed.Spec.Replicas, nil } @@ -2283,7 +2283,7 @@ func getReplicasFromRuntimeObject(obj runtime.Object) (int32, error) { return *typed.Spec.Replicas, nil } return 0, nil - case *extensions.Deployment: + case *extensionsv1beta1.Deployment: if typed.Spec.Replicas != nil { return *typed.Spec.Replicas, nil } @@ -2293,7 +2293,7 @@ func getReplicasFromRuntimeObject(obj runtime.Object) (int32, error) { return *typed.Spec.Replicas, nil } return 0, nil - case *extensions.DaemonSet: + case *extensionsv1beta1.DaemonSet: return 0, nil case *appsv1.DaemonSet: return 0, nil