From 0b4129c856069992185f0befdff7805b26640627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Mon, 23 Sep 2019 12:08:15 +0200 Subject: [PATCH 1/2] rook-ceph olm: add missing nfs crd example MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When displaying the CRDs OLM looks into the alm-examples field in the CSV file, the NFS CRD example was missing so let's add it. Signed-off-by: Sébastien Han --- .../olm/ceph/assemble/metadata-common.yaml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/cluster/olm/ceph/assemble/metadata-common.yaml b/cluster/olm/ceph/assemble/metadata-common.yaml index 048024047..f956a6743 100644 --- a/cluster/olm/ceph/assemble/metadata-common.yaml +++ b/cluster/olm/ceph/assemble/metadata-common.yaml @@ -174,5 +174,25 @@ metadata: "store": "my-store", "displayName": "my display name" } + }, + { + "apiVersion": "ceph.rook.io/v1", + "kind": "CephNFS", + "metadata": { + "name": "my-nfs", + "namespace": "rook-ceph" + }, + "spec": { + "rados": { + "pool": "myfs-data0", + "namespace": "nfs-ns" + }, + "server": { + "active": 3, + "placement": null, + "annotations": null, + "resources": null + } + } } ] From 2e482d15a36e90a186abf3ac6f49fca077515da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Mon, 23 Sep 2019 12:10:38 +0200 Subject: [PATCH 2/2] ceph: common.yaml remove empty line MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don't need this empty line. Signed-off-by: Sébastien Han --- cluster/examples/kubernetes/ceph/common.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/cluster/examples/kubernetes/ceph/common.yaml b/cluster/examples/kubernetes/ceph/common.yaml index 3386b9735..cbf56ecf6 100644 --- a/cluster/examples/kubernetes/ceph/common.yaml +++ b/cluster/examples/kubernetes/ceph/common.yaml @@ -302,7 +302,6 @@ spec: annotations: {} placement: {} resources: {} - # OLM: END CEPH NFS CRD # OLM: BEGIN CEPH OBJECT STORE CRD ---