Skip to content

Commit 643d46a

Browse files
authored
Merge pull request #63271 from ShaunaDiaz/OCPBUGS-16043
OCPBUGS#16043: Clarify mountOptions for MicroShift
2 parents ab797d3 + 55efbee commit 643d46a

File tree

3 files changed

+39
-4
lines changed

3 files changed

+39
-4
lines changed

microshift_storage/understanding-persistent-storage-microshift.adoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ include::modules/storage-persistent-storage-reclaim.adoc[leveloffset=+2]
2323

2424
include::modules/storage-persistent-storage-pv.adoc[leveloffset=+1]
2525

26+
ifdef::microshift[]
27+
[role="_additional-resources"]
28+
.Additional resources
29+
* link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_file_systems/mounting-file-systems_managing-file-systems#common-mount-options_mounting-file-systems[Common mount options]
30+
endif::microshift[]
31+
2632
include::modules/storage-persistent-storage-pvc.adoc[leveloffset=+1]
2733
2834
include::modules/storage-persistent-storage-fsGroup.adoc[leveloffset=+1]

modules/storage-persistent-storage-pv.adoc

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ You can specify mount options while mounting a PV by using the attribute `mountO
252252

253253
For example:
254254

255+
ifndef::microshift[]
255256
.Mount options example
256257
[source,yaml]
257258
----
@@ -301,3 +302,31 @@ ifndef::openshift-dedicated,openshift-rosa[]
301302
Fibre Channel and HostPath PVs do not support mount options.
302303
====
303304
endif::openshift-dedicated,openshift-rosa[]
305+
endif::microshift[]
306+
307+
ifdef::microshift[]
308+
.Mount options example
309+
[source,yaml]
310+
----
311+
apiVersion: storage.k8s.io/v1
312+
kind: StorageClass
313+
metadata:
314+
annotations:
315+
storageclass.kubernetes.io/is-default-class: "true"
316+
name: topolvm-provisioner
317+
mountOptions:
318+
- uid=1500
319+
- gid=1500
320+
parameters:
321+
csi.storage.k8s.io/fstype: xfs
322+
provisioner: topolvm.io
323+
reclaimPolicy: Delete
324+
volumeBindingMode: WaitForFirstConsumer
325+
allowVolumeExpansion: true
326+
----
327+
328+
[NOTE]
329+
====
330+
`mountOptions` are not validated. Incorrect values will cause the mount to fail and an event to be logged to the PVC.
331+
====
332+
endif::microshift[]

modules/storage-persistent-storage-pvc.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ spec:
2727
status:
2828
...
2929
----
30-
<1> Name of the PVC
31-
<2> The access mode, defining the read-write and mount permissions
32-
<3> The amount of storage available to the PVC
33-
<4> Name of the `StorageClass` required by the claim
30+
<1> Name of the PVC.
31+
<2> The access mode, defining the read-write and mount permissions.
32+
<3> The amount of storage available to the PVC.
33+
<4> Name of the `StorageClass` required by the claim.
3434

3535
[id="pvc-storage-class_{context}"]
3636
== Storage classes

0 commit comments

Comments
 (0)