Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

helm: addition of mountOptions into storage class configuration #9287

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions Documentation/helm-ceph-cluster.md
Expand Up @@ -88,6 +88,7 @@ The `cephBlockPools` array in the values file will define a list of CephBlockPoo
| `storageClass.parameters` | See [Block Storage](ceph-block.md) documentation or the helm values.yaml for suitable values | see values.yaml |
| `storageClass.reclaimPolicy` | The default [Reclaim Policy](https://kubernetes.io/docs/concepts/storage/storage-classes/#reclaim-policy) to apply to PVCs created with this storage class. | `Delete` |
| `storageClass.allowVolumeExpansion` | Whether [volume expansion](https://kubernetes.io/docs/concepts/storage/storage-classes/#allow-volume-expansion) is allowed by default. | `true` |
| `storageClass.mountOptions` | Specifies the mount options for storageClass | `[]` |

### Ceph File Systems

Expand All @@ -101,6 +102,7 @@ The `cephFileSystems` array in the values file will define a list of CephFileSys
| `storageClass.name` | The name of the storage class | `ceph-filesystem` |
| `storageClass.parameters` | See [Shared Filesystem](ceph-filesystem.md) documentation or the helm values.yaml for suitable values | see values.yaml |
| `storageClass.reclaimPolicy` | The default [Reclaim Policy](https://kubernetes.io/docs/concepts/storage/storage-classes/#reclaim-policy) to apply to PVCs created with this storage class. | `Delete` |
| `storageClass.mountOptions` | Specifies the mount options for storageClass | `[]` |

### Ceph Object Stores

Expand Down
6 changes: 6 additions & 0 deletions deploy/charts/rook-ceph-cluster/templates/cephblockpool.yaml
Expand Up @@ -22,5 +22,11 @@ parameters:
{{ toYaml $blockpool.storageClass.parameters | indent 2 }}
reclaimPolicy: {{ default "Delete" $blockpool.storageClass.reclaimPolicy }}
allowVolumeExpansion: {{ default "true" $blockpool.storageClass.allowVolumeExpansion }}
{{- if $blockpool.storageClass.mountOptions }}
mountOptions:
{{- range $blockpool.storageClass.mountOptions }}
- {{ . }}
{{- end }}
{{- end }}
{{ end }}
{{ end }}
6 changes: 6 additions & 0 deletions deploy/charts/rook-ceph-cluster/templates/cephfilesystem.yaml
Expand Up @@ -23,5 +23,11 @@ parameters:
{{ toYaml $filesystem.storageClass.parameters | indent 2 }}
reclaimPolicy: {{ default "Delete" $filesystem.storageClass.reclaimPolicy }}
allowVolumeExpansion: {{ default "true" $filesystem.storageClass.allowVolumeExpansion }}
{{- if $filesystem.storageClass.mountOptions }}
mountOptions:
{{- range $filesystem.storageClass.mountOptions }}
- {{ . }}
{{- end }}
{{- end }}
{{ end }}
{{ end }}
2 changes: 2 additions & 0 deletions deploy/charts/rook-ceph-cluster/values.yaml
Expand Up @@ -329,6 +329,7 @@ cephBlockPools:
isDefault: true
reclaimPolicy: Delete
allowVolumeExpansion: true
mountOptions: []
# see https://github.com/rook/rook/blob/master/Documentation/ceph-block.md#provision-storage for available configuration
parameters:
# (optional) mapOptions is a comma-separated list of map options.
Expand Down Expand Up @@ -381,6 +382,7 @@ cephFileSystems:
name: ceph-filesystem
reclaimPolicy: Delete
allowVolumeExpansion: true
mountOptions: []
# see https://github.com/rook/rook/blob/master/Documentation/ceph-filesystem.md#provision-storage for available configuration
parameters:
# The secrets contain Ceph admin credentials.
Expand Down