github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #45805 from weiwei04/ceph-imageformat-2

Browse Source 
Automatic merge from submit-queue

storageclass ceph add imageformat parameter

**What this PR does / why we need it**:
Add a imageformat parameter for StorageClass(ceph rbd)

k8s hard coded ceph imageformat 1, according to [ceph manual](http://docs.ceph.com/docs/master/man/8/rbd/), imageformat 1 was deprecated, we should add an extra ceph parameter to set ceph rbd imageformat. Ceph rbd imageformat can only be 1 or 2, set the default value to 1.

**Release note**:
```release-note
Allow StorageClass Ceph RBD to specify image format and image features.
```
This commit is contained in:
Kubernetes Submit Queue
2017-06-23 16:43:37 -07:00
committed by GitHub
parent 1a93dd60bb 4e5e9ca0cd
commit e554dd6d3d
4 changed files with 55 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/persistent-volume-provisioning/README.md
View File

@@ -209,6 +209,7 @@ parameters:
pool: kube
userId: kube
userSecretName: ceph-secret-user
imageFormat: "1"
```
* `monitors`: Ceph monitors, comma delimited. It is required.
@@ -218,6 +219,10 @@ parameters:
* `pool`: Ceph RBD pool. Default is "rbd".
* `userId`: Ceph client ID that is used to map the RBD image. Default is the same as `adminId`.
* `userSecretName`: The name of Ceph Secret for `userId` to map RBD image. It must exist in the same namespace as PVCs. It is required.
* `imageFormat`: Ceph RBD image format, "1" or "2". Default is "1".
* `imageFeatures`: Ceph RBD image format 2 features, comma delimited. This is optional, and only be used if you set `imageFormat` to "2". Currently supported features are `layering` only. Default is "", no features is turned on.
NOTE: We cannot turn on `exclusive-lock` feature for now (and `object-map`, `fast-diff`, `journaling` which require `exclusive-lock`), because exclusive lock and advisory lock cannot work together. (See [#45805](https://issue.k8s.io/45805))
#### Quobyte