From 4c0c67df1af5af21a1ca4fe62357ee03191ab591 Mon Sep 17 00:00:00 2001 From: Satoru Takeuchi Date: Tue, 2 May 2023 11:12:25 +0000 Subject: [PATCH] osd: supoprt expand lvm osd on pvc The expansion of OSD on PVC is only supported in raw mode OSD. It's nice to support lvm mode osd too. Closes: https://github.com/rook/rook/issues/10835 Signed-off-by: Satoru Takeuchi (cherry picked from commit 13e4464fed972069c0dacfad562545532666dbbf) --- pkg/operator/ceph/cluster/osd/spec.go | 2 +- pkg/operator/ceph/cluster/osd/spec_test.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/operator/ceph/cluster/osd/spec.go b/pkg/operator/ceph/cluster/osd/spec.go index 26c43b3e9..80a8c15df 100644 --- a/pkg/operator/ceph/cluster/osd/spec.go +++ b/pkg/operator/ceph/cluster/osd/spec.go @@ -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 diff --git a/pkg/operator/ceph/cluster/osd/spec_test.go b/pkg/operator/ceph/cluster/osd/spec_test.go index 84ab07ddb..fc0661405 100644 --- a/pkg/operator/ceph/cluster/osd/spec_test.go +++ b/pkg/operator/ceph/cluster/osd/spec_test.go @@ -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)