From da863e4156bfbe04f76c8a769968c4918aac34e3 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Mon, 14 Sep 2020 21:43:25 -0600 Subject: [PATCH] ceph: do not change selector labels during upgrade The selector labels used for mons cannot change during upgrade or else the upgrade will hang when the cluster is checking for mon status immediately after the upgrade begins. Signed-off-by: Travis Nielsen --- pkg/operator/ceph/cluster/mon/spec.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/operator/ceph/cluster/mon/spec.go b/pkg/operator/ceph/cluster/mon/spec.go index f64c39ce3..cc5c9a36b 100644 --- a/pkg/operator/ceph/cluster/mon/spec.go +++ b/pkg/operator/ceph/cluster/mon/spec.go @@ -52,7 +52,7 @@ func (c *Cluster) getLabels(monConfig *monConfig, canary, includeNewLabels bool) if canary { labels["mon_canary"] = "true" } - if c.spec.Mon.VolumeClaimTemplate != nil { + if c.spec.Mon.VolumeClaimTemplate != nil && includeNewLabels { labels["pvc_name"] = monConfig.ResourceName }