Skip to content

Commit 1fcdda2

Browse files
authored
Merge pull request #97678 from ShaunaDiaz/OSDOCS-15879
OSDOCS-15879: fixes conditionals Storage MicroShift
2 parents 3fdef43 + d7a6e70 commit 1fcdda2

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

modules/storage-persistent-storage-pv.adoc

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ Direct matches are always attempted first. The volume's modes must match or cont
109109

110110
All volumes with the same modes are grouped, and then sorted by size, smallest to largest. The binder gets the group with matching modes and iterates over each, in size order, until one size matches.
111111

112-
ifndef::microshift[]
113112
[IMPORTANT]
114113
====
115114
Volume access modes describe volume capabilities. They are not enforced constraints. The storage provider is responsible for runtime errors resulting from invalid use of the resource. Errors in the provider show up at runtime as mount errors.
@@ -120,7 +119,6 @@ For example, NFS offers `ReadWriteOnce` access mode. If you want to use the volu
120119
iSCSI and Fibre Channel volumes do not currently have any fencing mechanisms. You must ensure the volumes are only used by one node at a time. In certain situations, such as draining a node, the volumes can be used simultaneously by two nodes. Before draining the node, delete the pods that use the volumes.
121120
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
122121
====
123-
endif::microshift[]
124122

125123
The following table lists the access modes:
126124

@@ -151,35 +149,34 @@ endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
151149
and {rh-storage-first}. For third-party drivers, contact your storage vendor.
152150
--
153151

154-
ifndef::microshift[]
155152
.Supported access modes for persistent volumes
156153
[cols=",^v,^v,^v,^v", width="100%",options="header"]
157154
|===
158155
|Volume plugin |ReadWriteOnce ^[1]^ | ReadWriteOncePod |ReadOnlyMany|ReadWriteMany
159-
|AWS EBS ^[2]^ | ✅ | ✅ | |
156+
|AWS EBS ^[2]^ | ✅ | ✅ | |
160157
|AWS EFS | ✅ | ✅ | ✅ | ✅
161158
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
162159
|Azure File | ✅ |✅ | ✅ | ✅
163-
|Azure Disk | ✅ | ✅ | |
164-
//|Ceph RBD | ✅ | ✅ |✅ |
160+
|Azure Disk | ✅ | ✅ | |
161+
//|Ceph RBD | ✅ | ✅ |✅ |
165162
//|CephFS | ✅ | ✅ | ✅ | ✅
166163
|CIFS/SMB | ✅ | ✅ | ✅ | ✅
167-
|Cinder | ✅ | ✅ | |
164+
|Cinder | ✅ | ✅ | |
168165
|Fibre Channel | ✅ | ✅ |✅ | ✅ ^[3]^
169166
endif::[]
170167
ifndef::openshift-rosa,openshift-rosa-hcp[]
171-
|GCP Persistent Disk | ✅ |✅ | |
168+
|GCP Persistent Disk | ✅ |✅ | |
172169
|GCP Filestore | ✅ | ✅ |✅ | ✅
173170
endif::openshift-rosa,openshift-rosa-hcp[]
174171
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
175172
//|GlusterFS | ✅ |✅ | ✅ | ✅
176-
|HostPath | ✅ |✅ | |
173+
|HostPath | ✅ |✅ | |
177174
|{ibm-power-server-title} Disk | ✅ |✅ | ✅ | ✅
178-
|{ibm-cloud-name} VPC Disk | ✅ |✅ | |
175+
|{ibm-cloud-name} VPC Disk | ✅ |✅ | |
179176
|iSCSI | ✅ | ✅ |✅ | ✅ ^[3]^
180-
|Local volume | ✅ |✅ | |
177+
|Local volume | ✅ |✅ | |
181178
endif::[]
182-
|LVM Storage | ✅ | ✅ | |
179+
|LVM Storage | ✅ | ✅ | |
183180
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
184181
|NFS | ✅ | ✅ |✅ | ✅
185182
|OpenStack Manila | |✅ | | ✅
@@ -204,6 +201,7 @@ endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
204201
endif::microshift[]
205202

206203
ifdef::microshift[]
204+
[id="supported-access-modes_{context}"]
207205
== Supported access modes
208206
LVMS is the only CSI plugin {product-title} supports. The hostPath and LVs built in to {OCP} also support RWO.
209207
endif::microshift[]
@@ -352,6 +350,6 @@ allowVolumeExpansion: true
352350

353351
[NOTE]
354352
====
355-
`mountOptions` are not validated. Incorrect values will cause the mount to fail and an event to be logged to the PVC.
353+
The `mountOptions` parameter values are not validated. Incorrect values cause the mount to fail and an event to be logged to the PVC.
356354
====
357355
endif::microshift[]

0 commit comments

Comments
 (0)