feedc0de/my-rook-config
1
0 Fork 0
forked from rook/rook
Code Pull Requests Activity

Merge pull request #12240 from rook/mergify/bp/release-1.11/pr-12164

Browse Source 
osd: Support expanding lvm osd on pvc (backport #12164)
This commit is contained in:
Travis Nielsen authored and GitHub committed 2023-05-16 14:13:55 -06:00
2 parents 75c9efa443 4c0c67df1a
commit 18667fa45e
2 files changed
+4 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pkg/operator/ceph/cluster/osd/spec.go
+1 -1
View File
@@ -553,8 +553,8 @@ func (c *Cluster) makeDeployment(osdProps osdProperties, osd OSDInfo, provisionC
initContainers = append(initContainers, c.getExpandEncryptedPVCInitContainer(osdDataDirPath, osdProps))
}
initContainers = append(initContainers, c.getActivatePVCInitContainer(osdProps, osdID))
initContainers = append(initContainers, c.getExpandPVCInitContainer(osdProps, osdID))
}
initContainers = append(initContainers, c.getExpandPVCInitContainer(osdProps, osdID))
} else {
// Add the volume to the spec and the mount to the daemon container
// so that it can pick the already mounted/activated osd metadata path
pkg/operator/ceph/cluster/osd/spec_test.go
+3 -2
View File
@@ -198,11 +198,12 @@ func testPodDevices(t *testing.T, dataDir, deviceName string, allDevices bool) {
deployment, err = c.makeDeployment(osdProp, osd, dataPathMap)
assert.Nil(t, err)
assert.NotNil(t, deployment)
assert.Equal(t, 4, len(deployment.Spec.Template.Spec.InitContainers), deployment.Spec.Template.Spec.InitContainers[2].Name)
assert.Equal(t, 5, len(deployment.Spec.Template.Spec.InitContainers), deployment.Spec.Template.Spec.InitContainers[2].Name)
assert.Equal(t, "config-init", deployment.Spec.Template.Spec.InitContainers[0].Name)
assert.Equal(t, "copy-bins", deployment.Spec.Template.Spec.InitContainers[1].Name)
assert.Equal(t, "blkdevmapper", deployment.Spec.Template.Spec.InitContainers[2].Name)
assert.Equal(t, "chown-container-data-dir", deployment.Spec.Template.Spec.InitContainers[3].Name)
assert.Equal(t, "expand-bluefs", deployment.Spec.Template.Spec.InitContainers[3].Name)
assert.Equal(t, "chown-container-data-dir", deployment.Spec.Template.Spec.InitContainers[4].Name)
assert.Equal(t, 1, len(deployment.Spec.Template.Spec.Containers))
initCont = deployment.Spec.Template.Spec.InitContainers[0]
assert.Equal(t, 5, len(initCont.VolumeMounts), initCont.VolumeMounts)