From 05d8b448d274e30772750fcea71b10c8177e556e Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <liggitt@google.com>
Date: Sat, 29 Jun 2019 12:40:16 -0700
Subject: [PATCH] CRD v1: drop spec.scope default

---
 .../pkg/apis/apiextensions/v1/defaults.go                      | 3 ---
 .../pkg/apis/apiextensions/v1/defaults_test.go                 | 1 -
 .../apiextensions-apiserver/pkg/apis/apiextensions/v1/types.go | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/defaults.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/defaults.go
index 9bdc6f63145..31c8ae19436 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/defaults.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/defaults.go
@@ -40,9 +40,6 @@ func SetDefaults_CustomResourceDefinition(obj *CustomResourceDefinition) {
 }
 
 func SetDefaults_CustomResourceDefinitionSpec(obj *CustomResourceDefinitionSpec) {
-	if len(obj.Scope) == 0 {
-		obj.Scope = NamespaceScoped
-	}
 	if len(obj.Names.Singular) == 0 {
 		obj.Names.Singular = strings.ToLower(obj.Names.Kind)
 	}
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/defaults_test.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/defaults_test.go
index 20f9dece1bb..c4f15a52410 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/defaults_test.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/defaults_test.go
@@ -39,7 +39,6 @@ func TestDefaults(t *testing.T) {
 			original: &CustomResourceDefinition{},
 			expected: &CustomResourceDefinition{
 				Spec: CustomResourceDefinitionSpec{
-					Scope:                 NamespaceScoped,
 					Conversion:            &CustomResourceConversion{Strategy: NoneConverter},
 					PreserveUnknownFields: utilpointer.BoolPtr(true),
 				},
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/types.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/types.go
index 3d38de05a54..53c40df75e7 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/types.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/types.go
@@ -38,7 +38,7 @@ type CustomResourceDefinitionSpec struct {
 	Group string `json:"group" protobuf:"bytes,1,opt,name=group"`
 	// Names are the names used to describe this custom resource
 	Names CustomResourceDefinitionNames `json:"names" protobuf:"bytes,3,opt,name=names"`
-	// Scope indicates whether this resource is cluster or namespace scoped.  Default is namespaced
+	// Scope indicates whether this resource is cluster or namespace scoped.
 	Scope ResourceScope `json:"scope" protobuf:"bytes,4,opt,name=scope,casttype=ResourceScope"`
 	// Versions is the list of all supported versions for this resource.
 	// Order: The version name will be used to compute the order.