From 3ebd68abf664a1cd38f44adda07d0b34787ce2ed Mon Sep 17 00:00:00 2001
From: jennybuckley <jennybuckley@google.com>
Date: Tue, 5 Sep 2017 14:10:24 -0700
Subject: [PATCH] Disable rbac/v1alpha1 settings/v1alpha1 scheduling/v1alpha1

---
 pkg/master/BUILD                     |  3 ---
 pkg/master/master.go                 | 10 ----------
 test/e2e/servicecatalog/podpreset.go |  2 +-
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/pkg/master/BUILD b/pkg/master/BUILD
index 77811ad284e..2de8094752f 100644
--- a/pkg/master/BUILD
+++ b/pkg/master/BUILD
@@ -79,10 +79,7 @@ go_library(
         "//vendor/k8s.io/api/networking/v1:go_default_library",
         "//vendor/k8s.io/api/policy/v1beta1:go_default_library",
         "//vendor/k8s.io/api/rbac/v1:go_default_library",
-        "//vendor/k8s.io/api/rbac/v1alpha1:go_default_library",
         "//vendor/k8s.io/api/rbac/v1beta1:go_default_library",
-        "//vendor/k8s.io/api/scheduling/v1alpha1:go_default_library",
-        "//vendor/k8s.io/api/settings/v1alpha1:go_default_library",
         "//vendor/k8s.io/api/storage/v1:go_default_library",
         "//vendor/k8s.io/api/storage/v1beta1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
diff --git a/pkg/master/master.go b/pkg/master/master.go
index d6f7130a076..ff3910ad6f1 100644
--- a/pkg/master/master.go
+++ b/pkg/master/master.go
@@ -38,10 +38,7 @@ import (
 	networkingapiv1 "k8s.io/api/networking/v1"
 	policyapiv1beta1 "k8s.io/api/policy/v1beta1"
 	rbacv1 "k8s.io/api/rbac/v1"
-	rbacv1alpha1 "k8s.io/api/rbac/v1alpha1"
 	rbacv1beta1 "k8s.io/api/rbac/v1beta1"
-	schedulingapiv1alpha1 "k8s.io/api/scheduling/v1alpha1"
-	settingv1alpha1 "k8s.io/api/settings/v1alpha1"
 	storageapiv1 "k8s.io/api/storage/v1"
 	storageapiv1beta1 "k8s.io/api/storage/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -392,13 +389,6 @@ func DefaultAPIResourceConfigSource() *serverstorage.ResourceConfig {
 		policyapiv1beta1.SchemeGroupVersion,
 		rbacv1.SchemeGroupVersion,
 		rbacv1beta1.SchemeGroupVersion,
-		// Don't copy this pattern. We enable rbac/v1alpha1 and settings/v1laph1
-		// by default only because they were enabled in previous releases.
-		// See https://github.com/kubernetes/kubernetes/pull/47690.
-		// TODO: disable rbac/v1alpha1 and settings/v1alpha1 by default in 1.8
-		rbacv1alpha1.SchemeGroupVersion,
-		settingv1alpha1.SchemeGroupVersion,
-		schedulingapiv1alpha1.SchemeGroupVersion,
 		storageapiv1.SchemeGroupVersion,
 		storageapiv1beta1.SchemeGroupVersion,
 		certificatesapiv1beta1.SchemeGroupVersion,
diff --git a/test/e2e/servicecatalog/podpreset.go b/test/e2e/servicecatalog/podpreset.go
index a94c7715298..58735beae3f 100644
--- a/test/e2e/servicecatalog/podpreset.go
+++ b/test/e2e/servicecatalog/podpreset.go
@@ -33,7 +33,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var _ = SIGDescribe("PodPreset", func() {
+var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() {
 	f := framework.NewDefaultFramework("podpreset")
 
 	var podClient *framework.PodClient