diff --git a/Documentation/CRDs/Cluster/ceph-cluster-crd.md b/Documentation/CRDs/Cluster/ceph-cluster-crd.md index f4b067195..badc2a35f 100755 --- a/Documentation/CRDs/Cluster/ceph-cluster-crd.md +++ b/Documentation/CRDs/Cluster/ceph-cluster-crd.md @@ -322,7 +322,7 @@ The following are the settings for Storage Class Device Sets which can be config * `preparePlacement`: The placement criteria for the preparation of the OSD devices. Creating OSDs is a two-step process and the prepare job may require different placement than the OSD daemons. If the `preparePlacement` is not specified, the `placement` will instead be applied for consistent placement for the OSD prepare jobs and OSD deployments. The `preparePlacement` is only useful for `portable` OSDs in the device sets. OSDs that are not portable will be tied to the host where the OSD prepare job initially runs. * For example, provisioning may require topology spread constraints across zones, but the OSD daemons may require constraints across hosts within the zones. * `portable`: If `true`, the OSDs will be allowed to move between nodes during failover. This requires a storage class that supports portability (e.g. `aws-ebs`, but not the local storage provisioner). If `false`, the OSDs will be assigned to a node permanently. Rook will configure Ceph's CRUSH map to support the portability. -* `tuneDeviceClass`: For example, Ceph cannot detect AWS volumes as HDDs from the storage class "gp2", so you can improve Ceph performance by setting this to true. +* `tuneDeviceClass`: For example, Ceph cannot detect AWS volumes as HDDs from the storage class "gp2-csi", so you can improve Ceph performance by setting this to true. * `tuneFastDeviceClass`: For example, Ceph cannot detect Azure disks as SSDs from the storage class "managed-premium", so you can improve Ceph performance by setting this to true.. * `volumeClaimTemplates`: A list of PVC templates to use for provisioning the underlying storage devices. * `metadata.name`: "data", "metadata", or "wal". If a single template is provided, the name must be "data". If the name is "metadata" or "wal", the devices are used to store the Ceph metadata or WAL respectively. In both cases, the devices must be raw devices or LVM logical volumes. diff --git a/Documentation/CRDs/Cluster/pvc-cluster.md b/Documentation/CRDs/Cluster/pvc-cluster.md index 231ff7dca..fc3efe432 100644 --- a/Documentation/CRDs/Cluster/pvc-cluster.md +++ b/Documentation/CRDs/Cluster/pvc-cluster.md @@ -8,7 +8,7 @@ in clusters where a local PV provisioner is available. ## AWS Storage Example -In this example, the mon and OSD volumes are provisioned from the AWS `gp2` storage class. This storage class can be replaced by any storage class that provides `file` mode (for mons) and `block` mode (for OSDs). +In this example, the mon and OSD volumes are provisioned from the AWS `gp2-csi` storage class. This storage class can be replaced by any storage class that provides `file` mode (for mons) and `block` mode (for OSDs). ```yaml apiVersion: ceph.rook.io/v1 @@ -25,7 +25,7 @@ spec: allowMultiplePerNode: false volumeClaimTemplate: spec: - storageClassName: gp2 + storageClassName: gp2-csi resources: requests: storage: 10Gi @@ -42,8 +42,8 @@ spec: resources: requests: storage: 10Gi - # IMPORTANT: Change the storage class depending on your environment (e.g. local-storage, gp2) - storageClassName: gp2 + # IMPORTANT: Change the storage class depending on your environment (e.g. local-storage, gp2-csi) + storageClassName: gp2-csi volumeMode: Block accessModes: - ReadWriteOnce diff --git a/Documentation/Contributing/rook-test-framework.md b/Documentation/Contributing/rook-test-framework.md index fbb212503..bc0d5ace5 100644 --- a/Documentation/Contributing/rook-test-framework.md +++ b/Documentation/Contributing/rook-test-framework.md @@ -95,7 +95,7 @@ go test -v -timeout 1800s -run CephSmokeSuite github.com/rook/rook/tests/integra ```console export TEST_ENV_NAME=openshift - export TEST_STORAGE_CLASS=gp2 + export TEST_STORAGE_CLASS=gp2-csi export TEST_BASE_DIR=/tmp ``` diff --git a/deploy/examples/cluster-on-pvc.yaml b/deploy/examples/cluster-on-pvc.yaml index 2087394aa..342c484cf 100644 --- a/deploy/examples/cluster-on-pvc.yaml +++ b/deploy/examples/cluster-on-pvc.yaml @@ -28,7 +28,7 @@ spec: # size appropriate for monitor data will be used. volumeClaimTemplate: spec: - storageClassName: gp2 + storageClassName: gp2-csi resources: requests: storage: 10Gi @@ -64,7 +64,7 @@ spec: portable: true # Certain storage class in the Cloud are slow # Rook can configure the OSD running on PVC to accommodate that by tuning some of the Ceph internal - # Currently, "gp2" has been identified as such + # Currently, "gp2-csi" has been identified as such tuneDeviceClass: true # Certain storage class in the Cloud are fast # Rook can configure the OSD running on PVC to accommodate that by tuning some of the Ceph internal @@ -132,7 +132,7 @@ spec: requests: storage: 10Gi # IMPORTANT: Change the storage class depending on your environment - storageClassName: gp2 + storageClassName: gp2-csi volumeMode: Block accessModes: - ReadWriteOnce diff --git a/deploy/examples/cluster-stretched-aws.yaml b/deploy/examples/cluster-stretched-aws.yaml index bf82efd38..c286e7dcc 100644 --- a/deploy/examples/cluster-stretched-aws.yaml +++ b/deploy/examples/cluster-stretched-aws.yaml @@ -37,7 +37,7 @@ spec: - name: us-east-2c volumeClaimTemplate: spec: - storageClassName: gp2 + storageClassName: gp2-csi resources: requests: storage: 10Gi @@ -85,7 +85,7 @@ spec: resources: requests: storage: 10Gi - storageClassName: gp2 + storageClassName: gp2-csi volumeMode: Block accessModes: - ReadWriteOnce @@ -118,7 +118,7 @@ spec: resources: requests: storage: 10Gi - storageClassName: gp2 + storageClassName: gp2-csi volumeMode: Block accessModes: - ReadWriteOnce diff --git a/pkg/operator/ceph/cluster/osd/create_test.go b/pkg/operator/ceph/cluster/osd/create_test.go index 6a5aea9de..7312d8b95 100644 --- a/pkg/operator/ceph/cluster/osd/create_test.go +++ b/pkg/operator/ceph/cluster/osd/create_test.go @@ -353,7 +353,7 @@ func Test_startProvisioningOverPVCs(t *testing.T) { Name: "set1", Count: 0, VolumeClaimTemplates: []cephv1.VolumeClaimTemplate{ - newDummyPVC("data", namespace, "10Gi", "gp2"), + newDummyPVC("data", namespace, "10Gi", "gp2-csi"), }, }, }, @@ -378,7 +378,7 @@ func Test_startProvisioningOverPVCs(t *testing.T) { Name: "set1", Count: 2, VolumeClaimTemplates: []cephv1.VolumeClaimTemplate{ - newDummyPVC("data", namespace, "10Gi", "gp2"), + newDummyPVC("data", namespace, "10Gi", "gp2-csi"), }, }, },