feedc0de/my-rook-config
1
0
Fork 0
forked from rook/rook
Code Pull Requests Activity

ceph: remove crd short names to avoid conflict with beta crds

Browse Source 
Signed-off-by: travisn <tnielsen@redhat.com>
This commit is contained in:
travisn
2018-12-05 16:23:55 -07:00
parent a29b876337
commit 9660f49624
4 changed files with 0 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cluster/charts/rook-ceph/templates/resources.yaml
-12
View File
@@ -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
---
cluster/examples/kubernetes/ceph/operator.yaml
-15
View File
@@ -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
---
tests/framework/installer/ceph_manifests.go
-15
View File
@@ -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
---
tests/integration/upgrade_test.go
-17
View File
@@ -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
---