Skip to content

Commit

Permalink
core: fix deletion of the osd-replace-config cm
Browse files Browse the repository at this point in the history
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 <[email protected]>
(cherry picked from commit 8dd237b)
  • Loading branch information
sp98 authored and mergify[bot] committed Oct 16, 2024
1 parent 1686b1a commit f43e088
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/operator/ceph/cluster/osd/osd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit f43e088

Please sign in to comment.