diff --git a/pkg/operator/ceph/csi/operator_driver.go b/pkg/operator/ceph/csi/operator_driver.go index 5ce7f097c..888f62f2a 100644 --- a/pkg/operator/ceph/csi/operator_driver.go +++ b/pkg/operator/ceph/csi/operator_driver.go @@ -83,6 +83,8 @@ func (r *ReconcileCSI) createOrUpdateRBDDriverResource(cluster cephv1.CephCluste return err } + spec.NodePlugin.Labels = CSIParam.CSIRBDPodLabels + spec.ControllerPlugin.Labels = CSIParam.CSIRBDPodLabels rbdDriver := &csiopv1.Driver{ TypeMeta: metav1.TypeMeta{}, ObjectMeta: metav1.ObjectMeta{ @@ -129,6 +131,9 @@ func (r *ReconcileCSI) createOrUpdateCephFSDriverResource(cluster cephv1.CephClu return err } + spec.NodePlugin.Labels = CSIParam.CSICephFSPodLabels + spec.ControllerPlugin.Labels = CSIParam.CSICephFSPodLabels + cephFsDriver := &csiopv1.Driver{ TypeMeta: metav1.TypeMeta{}, ObjectMeta: metav1.ObjectMeta{ @@ -179,6 +184,8 @@ func (r *ReconcileCSI) createOrUpdateNFSDriverResource(cluster cephv1.CephCluste if err != nil { return err } + spec.NodePlugin.Labels = CSIParam.CSINFSPodLabels + spec.ControllerPlugin.Labels = CSIParam.CSINFSPodLabels NFSDriver := &csiopv1.Driver{ TypeMeta: metav1.TypeMeta{}, diff --git a/pkg/operator/ceph/csi/operator_driver_test.go b/pkg/operator/ceph/csi/operator_driver_test.go index 3b8ac7572..0374656b3 100644 --- a/pkg/operator/ceph/csi/operator_driver_test.go +++ b/pkg/operator/ceph/csi/operator_driver_test.go @@ -67,6 +67,10 @@ func TestReconcileCSI_createOrUpdateDriverResources(t *testing.T) { }, } + CSIParam.CSIRBDPodLabels = map[string]string{"rbd-label": "rbd-value"} + CSIParam.CSICephFSPodLabels = map[string]string{"cephfs-label": "cephfs-value"} + CSIParam.CSINFSPodLabels = map[string]string{"nfs-label": "nfs-value"} + for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { ns := "test" @@ -153,13 +157,25 @@ func TestReconcileCSI_createOrUpdateDriverResources(t *testing.T) { } } + assert.Equal(t, "rbd-value", driver.Spec.ControllerPlugin.PodCommonSpec.Labels["rbd-label"]) + assert.Equal(t, "rbd-value", driver.Spec.NodePlugin.PodCommonSpec.Labels["rbd-label"]) + assert.NotEqualValues(t, "rbd-value", driver.Spec.NodePlugin.PodCommonSpec.Labels["cephfs-label"]) + // Test CephFS driver err = cl.Get(context.TODO(), types.NamespacedName{Name: fmt.Sprintf("%s.cephfs.csi.ceph.com", c.Namespace), Namespace: ns}, driver) assert.NoError(t, err) + assert.Equal(t, "cephfs-value", driver.Spec.ControllerPlugin.PodCommonSpec.Labels["cephfs-label"]) + assert.Equal(t, "cephfs-value", driver.Spec.NodePlugin.PodCommonSpec.Labels["cephfs-label"]) + assert.NotEqualValues(t, "cephfs-value", driver.Spec.NodePlugin.PodCommonSpec.Labels["rbd-label"]) + // Test NFS driver err = cl.Get(context.TODO(), types.NamespacedName{Name: fmt.Sprintf("%s.nfs.csi.ceph.com", c.Namespace), Namespace: ns}, driver) assert.NoError(t, err) + + assert.Equal(t, "nfs-value", driver.Spec.ControllerPlugin.PodCommonSpec.Labels["nfs-label"]) + assert.Equal(t, "nfs-value", driver.Spec.NodePlugin.PodCommonSpec.Labels["nfs-label"]) + assert.NotEqualValues(t, "nfs-value", driver.Spec.NodePlugin.PodCommonSpec.Labels["rbd-label"]) }) } }