From 9660f49624cb336d1ccb4e67fd7e25da95bc18dc Mon Sep 17 00:00:00 2001
From: travisn <tnielsen@redhat.com>
Date: Tue, 4 Dec 2018 00:17:21 -0700
Subject: [PATCH] ceph: remove crd short names to avoid conflict with beta crds

Signed-off-by: travisn <tnielsen@redhat.com>
---
 .../charts/rook-ceph/templates/resources.yaml   | 12 ------------
 cluster/examples/kubernetes/ceph/operator.yaml  | 15 ---------------
 tests/framework/installer/ceph_manifests.go     | 15 ---------------
 tests/integration/upgrade_test.go               | 17 -----------------
 4 files changed, 59 deletions(-)

diff --git a/cluster/charts/rook-ceph/templates/resources.yaml b/cluster/charts/rook-ceph/templates/resources.yaml
index b778f809e..216269f0d 100644
--- a/cluster/charts/rook-ceph/templates/resources.yaml
+++ b/cluster/charts/rook-ceph/templates/resources.yaml
@@ -10,9 +10,6 @@ spec:
     listKind: CephClusterList
     plural: cephclusters
     singular: cephcluster
-    shortNames:
-    - rcc
-    - cluster
   scope: Namespaced
   version: v1
   validation:
@@ -74,9 +71,6 @@ spec:
     listKind: CephFilesystemList
     plural: cephfilesystems
     singular: cephfilesystem
-    shortNames:
-    - rcfs
-    - filesystem
   scope: Namespaced
   version: v1
 ---
@@ -91,9 +85,6 @@ spec:
     listKind: CephObjectStoreList
     plural: cephobjectstores
     singular: cephobjectstore
-    shortNames:
-    - rco
-    - objectstore
   scope: Namespaced
   version: v1
 ---
@@ -125,9 +116,6 @@ spec:
     listKind: CephBlockPoolList
     plural: cephblockpools
     singular: cephblockpool
-    shortNames:
-    - rcp
-    - pool
   scope: Namespaced
   version: v1
 ---
diff --git a/cluster/examples/kubernetes/ceph/operator.yaml b/cluster/examples/kubernetes/ceph/operator.yaml
index 214a8f354..44f7062d6 100755
--- a/cluster/examples/kubernetes/ceph/operator.yaml
+++ b/cluster/examples/kubernetes/ceph/operator.yaml
@@ -14,9 +14,6 @@ spec:
     listKind: CephClusterList
     plural: cephclusters
     singular: cephcluster
-    shortNames:
-    - rcc
-    - cluster
   scope: Namespaced
   version: v1
   validation:
@@ -78,9 +75,6 @@ spec:
     listKind: CephFilesystemList
     plural: cephfilesystems
     singular: cephfilesystem
-    shortNames:
-    - rcfs
-    - filesystem
   scope: Namespaced
   version: v1
 ---
@@ -95,9 +89,6 @@ spec:
     listKind: CephObjectStoreList
     plural: cephobjectstores
     singular: cephobjectstore
-    shortNames:
-    - rco
-    - objectstore
   scope: Namespaced
   version: v1
 ---
@@ -112,9 +103,6 @@ spec:
     listKind: CephObjectStoreUserList
     plural: cephobjectstoreusers
     singular: cephobjectstoreuser
-    shortNames:
-    - rcou
-    - objectuser
   scope: Namespaced
   version: v1
 ---
@@ -129,9 +117,6 @@ spec:
     listKind: CephBlockPoolList
     plural: cephblockpools
     singular: cephblockpool
-    shortNames:
-    - rcp
-    - pool
   scope: Namespaced
   version: v1
 ---
diff --git a/tests/framework/installer/ceph_manifests.go b/tests/framework/installer/ceph_manifests.go
index 048197f3c..4d81f49f3 100644
--- a/tests/framework/installer/ceph_manifests.go
+++ b/tests/framework/installer/ceph_manifests.go
@@ -80,9 +80,6 @@ spec:
     listKind: CephClusterList
     plural: cephclusters
     singular: cephcluster
-    shortNames:
-    - rcc
-    - cluster
   scope: Namespaced
   version: v1
   validation:
@@ -144,9 +141,6 @@ spec:
     listKind: CephFilesystemList
     plural: cephfilesystems
     singular: cephfilesystem
-    shortNames:
-    - rcfs
-    - filesystem
   scope: Namespaced
   version: v1
 ---
@@ -161,9 +155,6 @@ spec:
     listKind: CephObjectStoreList
     plural: cephobjectstores
     singular: cephobjectstore
-    shortNames:
-    - rco
-    - objectstore
   scope: Namespaced
   version: v1
 ---
@@ -178,9 +169,6 @@ spec:
     listKind: CephObjectStoreUserList
     plural: cephobjectstoreusers
     singular: cephobjectstoreuser
-    shortNames:
-    - rcou
-    - objectuser
   scope: Namespaced
   version: v1
 ---
@@ -195,9 +183,6 @@ spec:
     listKind: CephBlockPoolList
     plural: cephblockpools
     singular: cephblockpool
-    shortNames:
-    - rcp
-    - pool
   scope: Namespaced
   version: v1
 ---
diff --git a/tests/integration/upgrade_test.go b/tests/integration/upgrade_test.go
index 6a360e06a..b33858e2d 100644
--- a/tests/integration/upgrade_test.go
+++ b/tests/integration/upgrade_test.go
@@ -185,9 +185,6 @@ spec:
     listKind: CephClusterList
     plural: cephclusters
     singular: cephcluster
-    shortNames:
-    - rcc
-    - cluster
   scope: Namespaced
   version: v1
   validation:
@@ -249,9 +246,6 @@ spec:
     listKind: CephFilesystemList
     plural: cephfilesystems
     singular: cephfilesystem
-    shortNames:
-    - rcfs
-    - filesystem
   scope: Namespaced
   version: v1
 ---
@@ -266,9 +260,6 @@ spec:
     listKind: CephObjectStoreList
     plural: cephobjectstores
     singular: cephobjectstore
-    shortNames:
-    - rco
-    - objectstore
   scope: Namespaced
   version: v1
 ---
@@ -283,9 +274,6 @@ spec:
     listKind: CephObjectStoreUserList
     plural: cephobjectstoreusers
     singular: cephobjectstoreuser
-    shortNames:
-    - rcou
-    - objectuser
   scope: Namespaced
   version: v1
 ---
@@ -300,9 +288,6 @@ spec:
     listKind: CephBlockPoolList
     plural: cephblockpools
     singular: cephblockpool
-    shortNames:
-    - rcp
-    - pool
   scope: Namespaced
   version: v1
 ---
@@ -317,8 +302,6 @@ spec:
     listKind: ObjectStoreUserList
     plural: objectstoreusers
     singular: objectstoreuser
-    shortNames:
-    - rcou
   scope: Namespaced
   version: v1
 ---