diff --git a/pkg/operator/ceph/controller/spec.go b/pkg/operator/ceph/controller/spec.go index 3f363bd86..699d68d1c 100644 --- a/pkg/operator/ceph/controller/spec.go +++ b/pkg/operator/ceph/controller/spec.go @@ -994,7 +994,7 @@ func GetDaemonsToSkipReconcile(ctx context.Context, clusterd *clusterd.Context, result := sets.New[string]() for _, deployment := range deployments.Items { if daemonID, ok := deployment.Labels[daemonName]; ok { - logger.Infof("found %s %q pod to skip reconcile", daemonID, daemonName) + logger.Infof("found %q %q pod to skip reconcile", daemonID, daemonName) result.Insert(daemonID) } } diff --git a/pkg/operator/ceph/nfs/nfs.go b/pkg/operator/ceph/nfs/nfs.go index 725c93c67..6f63b3481 100644 --- a/pkg/operator/ceph/nfs/nfs.go +++ b/pkg/operator/ceph/nfs/nfs.go @@ -63,7 +63,7 @@ func (r *ReconcileCephNFS) upCephNFS(n *cephv1.CephNFS) error { for i := 0; i < n.Spec.Server.Active; i++ { id := k8sutil.IndexToName(i) - if nfsToSkipReconcile.Has(id) { + if nfsToSkipReconcile.Has(fmt.Sprintf("%s-%s", n.Name, id)) { logger.Warningf("skipping reconcile of nfs daemon %q with label %q", id, cephv1.SkipReconcileLabelKey) continue } diff --git a/pkg/operator/ceph/nfs/nfs_test.go b/pkg/operator/ceph/nfs/nfs_test.go index 1a05e6d0a..90323eb34 100644 --- a/pkg/operator/ceph/nfs/nfs_test.go +++ b/pkg/operator/ceph/nfs/nfs_test.go @@ -216,7 +216,7 @@ func TestReconcileCephNFS_upCephNFS(t *testing.T) { func TestUpCephNFS_SkipsReconcile(t *testing.T) { ns := "skip-nfs-test" s := scheme.Scheme - daemonID := "a" + daemonID := "my-nfs-a" clientset := k8sfake.NewSimpleClientset() client := fake.NewClientBuilder().WithScheme(s).Build()