From f43e088fdacd40ec45895e14b6864e9853d30f55 Mon Sep 17 00:00:00 2001 From: Santosh Pillai Date: Wed, 16 Oct 2024 16:18:29 +0530 Subject: [PATCH] core: fix deletion of the osd-replace-config cm MustDelete DeleteOption was set to `true` when deleting osd-repalce-config configMap. This cm won't existing after all the OSDs get migrated. So deletion of the non-existent cm will result in error. This PR removes `mustDelete: true` from the DeletionOption when deleting osd-replace-config configmap Signed-off-by: Santosh Pillai (cherry picked from commit 8dd237b460b589315f198e7885611e4926842750) --- pkg/operator/ceph/cluster/osd/osd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/operator/ceph/cluster/osd/osd.go b/pkg/operator/ceph/cluster/osd/osd.go index e9b4c0c6453d..eb2886e19d17 100644 --- a/pkg/operator/ceph/cluster/osd/osd.go +++ b/pkg/operator/ceph/cluster/osd/osd.go @@ -294,7 +294,7 @@ func (c *Cluster) Start() error { } if c.spec.Storage.Store.UpdateStore == OSDStoreUpdateConfirmation { - delOpts := &k8sutil.DeleteOptions{MustDelete: true, WaitOptions: k8sutil.WaitOptions{Wait: true}} + delOpts := &k8sutil.DeleteOptions{WaitOptions: k8sutil.WaitOptions{Wait: true}} err := k8sutil.DeleteConfigMap(c.clusterInfo.Context, c.context.Clientset, OSDReplaceConfigName, namespace, delOpts) if err != nil { if kerrors.IsNotFound(err) {