From 35cef7369e27ffbe1c80565c3f7125d037b1d9e7 Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Thu, 20 Jun 2019 11:40:54 -0700 Subject: [PATCH] add import-alias for k8s.io/api/settings/v1alpha1 --- hack/.import-aliases | 3 ++- test/e2e/servicecatalog/podpreset.go | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/hack/.import-aliases b/hack/.import-aliases index 18019bb6a97..69de885f52e 100644 --- a/hack/.import-aliases +++ b/hack/.import-aliases @@ -29,5 +29,6 @@ "k8s.io/api/rbac/v1beta1": "rbacv1beta1", "k8s.io/api/scheduling/v1": "schedulingv1", "k8s.io/api/scheduling/v1alpha1": "schedulingv1alpha1", - "k8s.io/api/scheduling/v1beta1": "schedulingv1beta1" + "k8s.io/api/scheduling/v1beta1": "schedulingv1beta1", + "k8s.io/api/settings/v1alpha1": "settingsv1alpha1" } \ No newline at end of file diff --git a/test/e2e/servicecatalog/podpreset.go b/test/e2e/servicecatalog/podpreset.go index 4f992aed9bb..a0e1b80092f 100644 --- a/test/e2e/servicecatalog/podpreset.go +++ b/test/e2e/servicecatalog/podpreset.go @@ -22,7 +22,7 @@ import ( "time" "k8s.io/api/core/v1" - settings "k8s.io/api/settings/v1alpha1" + settingsv1alpha1 "k8s.io/api/settings/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -50,12 +50,12 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() { ginkgo.It("should create a pod preset", func() { ginkgo.By("Creating a pod preset") - pip := &settings.PodPreset{ + pip := &settingsv1alpha1.PodPreset{ ObjectMeta: metav1.ObjectMeta{ Name: "hello", Namespace: f.Namespace.Name, }, - Spec: settings.PodPresetSpec{ + Spec: settingsv1alpha1.PodPresetSpec{ Selector: metav1.LabelSelector{ MatchExpressions: []metav1.LabelSelectorRequirement{ { @@ -168,12 +168,12 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() { ginkgo.It("should not modify the pod on conflict", func() { ginkgo.By("Creating a pod preset") - pip := &settings.PodPreset{ + pip := &settingsv1alpha1.PodPreset{ ObjectMeta: metav1.ObjectMeta{ Name: "hello", Namespace: f.Namespace.Name, }, - Spec: settings.PodPresetSpec{ + Spec: settingsv1alpha1.PodPresetSpec{ Selector: metav1.LabelSelector{ MatchExpressions: []metav1.LabelSelectorRequirement{ { @@ -287,6 +287,6 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() { }) }) -func createPodPreset(c clientset.Interface, ns string, job *settings.PodPreset) (*settings.PodPreset, error) { +func createPodPreset(c clientset.Interface, ns string, job *settingsv1alpha1.PodPreset) (*settingsv1alpha1.PodPreset, error) { return c.SettingsV1alpha1().PodPresets(ns).Create(job) }