Skip to content

Commit ce42916

Browse files
authored
Merge pull request #40990 from darshan-nagaraj/BZ2036297
BZ2036297: Updated storage class name object and added callout
2 parents 1180e5f + 3a8abd8 commit ce42916

6 files changed

+39
-34
lines changed

modules/dynamic-provisioning-aws-definition.adoc

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,34 @@
1212
kind: StorageClass
1313
apiVersion: storage.k8s.io/v1
1414
metadata:
15-
name: slow
15+
name: <storage-class-name> <1>
1616
provisioner: kubernetes.io/aws-ebs
1717
parameters:
18-
type: io1 <1>
19-
iopsPerGB: "10" <2>
20-
encrypted: "true" <3>
21-
kmsKeyId: keyvalue <4>
22-
fsType: ext4 <5>
18+
type: io1 <2>
19+
iopsPerGB: "10" <3>
20+
encrypted: "true" <4>
21+
kmsKeyId: keyvalue <5>
22+
fsType: ext4 <6>
2323
----
24-
<1> (required) Select from `io1`, `gp2`, `sc1`, `st1`. The default is `gp2`.
24+
<1> (required) Name of the storage class. The persistent volume claim uses this storage class for provisioning the associated persistent volumes.
25+
<2> (required) Select from `io1`, `gp2`, `sc1`, `st1`. The default is `gp2`.
2526
See the
2627
link:http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html[AWS documentation]
2728
for valid Amazon Resource Name (ARN) values.
28-
<2> Optional: Only for *io1* volumes. I/O operations per second per GiB.
29+
<3> Optional: Only for *io1* volumes. I/O operations per second per GiB.
2930
The AWS volume plug-in multiplies this with the size of the requested
3031
volume to compute IOPS of the volume. The value cap is 20,000 IOPS, which
3132
is the maximum supported by AWS. See the
3233
link:http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html[AWS documentation]
3334
for further details.
34-
<3> Optional: Denotes whether to encrypt the EBS volume. Valid values
35+
<4> Optional: Denotes whether to encrypt the EBS volume. Valid values
3536
are `true` or `false`.
36-
<4> Optional: The full ARN of the key to use when encrypting the volume.
37+
<5> Optional: The full ARN of the key to use when encrypting the volume.
3738
If none is supplied, but `encypted` is set to `true`, then AWS generates a
3839
key. See the
3940
link:http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html[AWS documentation]
4041
for a valid ARN value.
41-
<5> Optional: File system that is created on dynamically provisioned
42+
<6> Optional: File system that is created on dynamically provisioned
4243
volumes. This value is copied to the `fsType` field of dynamically
4344
provisioned persistent volumes and the file system is created when the
4445
volume is mounted for the first time. The default value is `ext4`.

modules/dynamic-provisioning-azure-disk-definition.adoc

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,18 @@
1212
apiVersion: storage.k8s.io/v1
1313
kind: StorageClass
1414
metadata:
15-
name: managed-premium
15+
name: <storage-class-name> <1>
1616
provisioner: kubernetes.io/azure-disk
17-
volumeBindingMode: WaitForFirstConsumer <1>
17+
volumeBindingMode: WaitForFirstConsumer <2>
1818
allowVolumeExpansion: true
1919
parameters:
20-
kind: Managed <2>
21-
storageaccounttype: Premium_LRS <3>
20+
kind: Managed <3>
21+
storageaccounttype: Premium_LRS <4>
2222
reclaimPolicy: Delete
2323
----
24-
<1> Using `WaitForFirstConsumer` is strongly recommended. This provisions the volume while allowing enough storage to schedule the pod on a free worker node from an available zone.
25-
<2> Possible values are `Shared` (default), `Managed`, and `Dedicated`.
24+
<1> Name of the storage class. The persistent volume claim uses this storage class for provisioning the associated persistent volumes.
25+
<2> Using `WaitForFirstConsumer` is strongly recommended. This provisions the volume while allowing enough storage to schedule the pod on a free worker node from an available zone.
26+
<3> Possible values are `Shared` (default), `Managed`, and `Dedicated`.
2627
+
2728
[IMPORTANT]
2829
====
@@ -31,7 +32,7 @@ Red Hat only supports the use of `kind: Managed` in the storage class.
3132
With `Shared` and `Dedicated`, Azure creates unmanaged disks, while {product-title} creates a managed disk for machine OS (root) disks. But because Azure Disk does not allow the use of both managed and unmanaged disks on a node, unmanaged disks created with `Shared` or `Dedicated` cannot be attached to {product-title} nodes.
3233
====
3334

34-
<3> Azure storage account SKU tier. Default is empty. Note that Premium VMs can attach both `Standard_LRS` and `Premium_LRS` disks, Standard VMs can only attach `Standard_LRS` disks, Managed VMs can only attach managed disks, and unmanaged VMs can only attach unmanaged disks.
35+
<4> Azure storage account SKU tier. Default is empty. Note that Premium VMs can attach both `Standard_LRS` and `Premium_LRS` disks, Standard VMs can only attach `Standard_LRS` disks, Managed VMs can only attach managed disks, and unmanaged VMs can only attach unmanaged disks.
3536
+
3637
.. If `kind` is set to `Shared`, Azure creates all unmanaged disks in a few shared storage accounts in the same resource group as the cluster.
3738
.. If `kind` is set to `Managed`, Azure creates new managed disks.

modules/dynamic-provisioning-cinder-definition.adoc

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,19 @@
1212
kind: StorageClass
1313
apiVersion: storage.k8s.io/v1
1414
metadata:
15-
name: gold
15+
name: <storage-class-name> <1>
1616
provisioner: kubernetes.io/cinder
1717
parameters:
18-
type: fast <1>
19-
availability: nova <2>
20-
fsType: ext4 <3>
18+
type: fast <2>
19+
availability: nova <3>
20+
fsType: ext4 <4>
2121
----
22-
<1> Volume type created in Cinder. Default is empty.
23-
<2> Availability Zone. If not specified, volumes are generally
22+
<1> Name of the storage class. The persistent volume claim uses this storage class for provisioning the associated persistent volumes.
23+
<2> Volume type created in Cinder. Default is empty.
24+
<3> Availability Zone. If not specified, volumes are generally
2425
round-robined across all active zones where the {product-title} cluster
2526
has a node.
26-
<3> File system that is created on dynamically provisioned volumes. This
27+
<4> File system that is created on dynamically provisioned volumes. This
2728
value is copied to the `fsType` field of dynamically provisioned
2829
persistent volumes and the file system is created when the volume is
2930
mounted for the first time. The default value is `ext4`.

modules/dynamic-provisioning-gce-definition.adoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@
1212
apiVersion: storage.k8s.io/v1
1313
kind: StorageClass
1414
metadata:
15-
name: standard
15+
name: <storage-class-name> <1>
1616
provisioner: kubernetes.io/gce-pd
1717
parameters:
18-
type: pd-standard <1>
18+
type: pd-standard <2>
1919
replication-type: none
2020
volumeBindingMode: WaitForFirstConsumer
2121
allowVolumeExpansion: true
2222
reclaimPolicy: Delete
2323
----
24-
<1> Select either `pd-standard` or `pd-ssd`. The default is `pd-standard`.
24+
<1> Name of the storage class. The persistent volume claim uses this storage class for provisioning the associated persistent volumes.
25+
<2> Select either `pd-standard` or `pd-ssd`. The default is `pd-standard`.

modules/dynamic-provisioning-storage-class-definition.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ElasticBlockStore (EBS) object definition.
1717
kind: StorageClass <1>
1818
apiVersion: storage.k8s.io/v1 <2>
1919
metadata:
20-
name: gp2 <3>
20+
name: <storage-class-name> <3>
2121
annotations: <4>
2222
storageclass.kubernetes.io/is-default-class: 'true'
2323
...

modules/dynamic-provisioning-vsphere-definition.adoc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@
1313
kind: StorageClass
1414
apiVersion: storage.k8s.io/v1
1515
metadata:
16-
name: slow
17-
provisioner: kubernetes.io/vsphere-volume <1>
16+
name: <storage-class-name> <1>
17+
provisioner: kubernetes.io/vsphere-volume <2>
1818
parameters:
19-
diskformat: thin <2>
19+
diskformat: thin <3>
2020
----
21-
<1> For more information about using VMware vSphere with {product-title},
21+
<1> Name of the storage class. The persistent volume claim uses this storage class for provisioning the associated persistent volumes.
22+
<2> For more information about using VMware vSphere with {product-title},
2223
see the
2324
link:https://vmware.github.io/vsphere-storage-for-kubernetes/documentation/index.html[VMware vSphere documentation].
24-
<2> `diskformat`: `thin`, `zeroedthick` and `eagerzeroedthick` are all
25+
<3> `diskformat`: `thin`, `zeroedthick` and `eagerzeroedthick` are all
2526
valid disk formats. See vSphere docs for additional details regarding the
2627
disk format types. The default value is `thin`.

0 commit comments

Comments
 (0)