Skip to content

Commit b0c6c72

Browse files
authored
Merge pull request #446 from iPraveenParihar/cephfs/omap-sidecar
cephfs: add controller sidecar for setting CSI metadata on subvolumes
2 parents 5fad4eb + 45e1c0a commit b0c6c72

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

.github/actions/deploy-charts/action.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ runs:
8686
.drivers |=
8787
with_entries(
8888
.value.enabled = (.value.name == strenv(DRIVER_NAME)) |
89-
.value.deployCsiAddons = (.value.name == "rbd.csi.ceph.com")
89+
.value.deployCsiAddons = (.value.name == "rbd.csi.ceph.com") |
90+
.value.generateOMapInfo = ((.value.name == "cephfs.csi.ceph.com") or (.value.name == "rbd.csi.ceph.com"))
9091
)
9192
' ./deploy/charts/ceph-csi-drivers/values.yaml
9293

internal/controller/driver_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ func (r *driverReconcile) reconcileControllerPluginDeployment() error {
872872
})
873873
}
874874
// OMap Generator Sidecar Container
875-
if r.isRbdDriver() && ptr.Deref(r.driver.Spec.GenerateOMapInfo, false) {
875+
if (r.isRbdDriver() || r.isCephFsDriver()) && ptr.Deref(r.driver.Spec.GenerateOMapInfo, false) {
876876
containers = append(containers, corev1.Container{
877877
Name: "csi-omap-generator",
878878
Image: r.images["plugin"],

0 commit comments

Comments
 (0)