From b70d1c51e1ccda257ec408ba3c948cb4fe05a3fc Mon Sep 17 00:00:00 2001 From: jennybuckley Date: Tue, 26 Sep 2017 13:57:15 -0700 Subject: [PATCH 1/4] Skip podpreset test if the alpha feature setttings/v1alpha1 is disabled --- test/e2e/servicecatalog/BUILD | 1 + test/e2e/servicecatalog/podpreset.go | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/test/e2e/servicecatalog/BUILD b/test/e2e/servicecatalog/BUILD index 07b8f440042..5e37bec9fec 100644 --- a/test/e2e/servicecatalog/BUILD +++ b/test/e2e/servicecatalog/BUILD @@ -15,6 +15,7 @@ go_library( "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/settings/v1alpha1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library", diff --git a/test/e2e/servicecatalog/podpreset.go b/test/e2e/servicecatalog/podpreset.go index 3371a3a531e..98043335806 100644 --- a/test/e2e/servicecatalog/podpreset.go +++ b/test/e2e/servicecatalog/podpreset.go @@ -24,6 +24,7 @@ import ( "k8s.io/api/core/v1" settings "k8s.io/api/settings/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/watch" clientset "k8s.io/client-go/kubernetes" @@ -73,6 +74,9 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() { } _, err := createPodPreset(f.ClientSet, f.Namespace.Name, pip) + if errors.IsNotFound(err) { + framework.Skipf("podpresets requires k8s.io/api/settings/v1alpha1 to be enabled") + } Expect(err).NotTo(HaveOccurred()) By("creating the pod") @@ -178,6 +182,9 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() { } _, err := createPodPreset(f.ClientSet, f.Namespace.Name, pip) + if errors.IsNotFound(err) { + framework.Skipf("podpresets requires k8s.io/api/settings/v1alpha1 to be enabled") + } Expect(err).NotTo(HaveOccurred()) By("creating the pod") From 3c96d64288420ae2cecb4148588ca395143f9a79 Mon Sep 17 00:00:00 2001 From: jennybuckley Date: Fri, 29 Sep 2017 10:00:52 -0700 Subject: [PATCH 2/4] Skip podpreset test if the alpha feature setttings/v1alpha1 is disabled --- test/e2e/servicecatalog/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/servicecatalog/BUILD b/test/e2e/servicecatalog/BUILD index 5e37bec9fec..7244497835d 100644 --- a/test/e2e/servicecatalog/BUILD +++ b/test/e2e/servicecatalog/BUILD @@ -15,7 +15,7 @@ go_library( "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/settings/v1alpha1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/errors:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library", From 475194d6e750e5890d426170a34379d7d70159d3 Mon Sep 17 00:00:00 2001 From: jennybuckley Date: Fri, 29 Sep 2017 10:50:20 -0700 Subject: [PATCH 3/4] Go fmt --- test/e2e/servicecatalog/podpreset.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/e2e/servicecatalog/podpreset.go b/test/e2e/servicecatalog/podpreset.go index 98043335806..f827331cafd 100644 --- a/test/e2e/servicecatalog/podpreset.go +++ b/test/e2e/servicecatalog/podpreset.go @@ -23,8 +23,8 @@ import ( "k8s.io/api/core/v1" settings "k8s.io/api/settings/v1alpha1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/watch" clientset "k8s.io/client-go/kubernetes" @@ -75,8 +75,8 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() { _, err := createPodPreset(f.ClientSet, f.Namespace.Name, pip) if errors.IsNotFound(err) { - framework.Skipf("podpresets requires k8s.io/api/settings/v1alpha1 to be enabled") - } + framework.Skipf("podpresets requires k8s.io/api/settings/v1alpha1 to be enabled") + } Expect(err).NotTo(HaveOccurred()) By("creating the pod") @@ -183,8 +183,8 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() { _, err := createPodPreset(f.ClientSet, f.Namespace.Name, pip) if errors.IsNotFound(err) { - framework.Skipf("podpresets requires k8s.io/api/settings/v1alpha1 to be enabled") - } + framework.Skipf("podpresets requires k8s.io/api/settings/v1alpha1 to be enabled") + } Expect(err).NotTo(HaveOccurred()) By("creating the pod") From 653fbac87b82c16ed6d9e6e159886cb4b8005645 Mon Sep 17 00:00:00 2001 From: jennybuckley Date: Fri, 29 Sep 2017 11:06:12 -0700 Subject: [PATCH 4/4] Bazel fmt --- test/e2e/servicecatalog/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/servicecatalog/BUILD b/test/e2e/servicecatalog/BUILD index 7244497835d..26d97ef389b 100644 --- a/test/e2e/servicecatalog/BUILD +++ b/test/e2e/servicecatalog/BUILD @@ -14,8 +14,8 @@ go_library( "//vendor/github.com/onsi/gomega:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/settings/v1alpha1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library",