Skip to content

Commit

Permalink
Merge pull request rook#14863 from rook/mergify/bp/release-1.15/pr-14862
Browse files Browse the repository at this point in the history
core: fix deletion of the osd-replace-config cm (backport rook#14862)
  • Loading branch information
mergify[bot] authored Oct 16, 2024
2 parents 1686b1a + f43e088 commit bf7f9eb
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 bf7f9eb

Please sign in to comment.