diff --git a/pkg/operator/ceph/csi/ceph_connection.go b/pkg/operator/ceph/csi/ceph_connection.go index d33be98f2..1708692cb 100644 --- a/pkg/operator/ceph/csi/ceph_connection.go +++ b/pkg/operator/ceph/csi/ceph_connection.go @@ -32,11 +32,11 @@ import ( ) func CreateUpdateCephConnection(c client.Client, clusterInfo *cephclient.ClusterInfo, clusterSpec cephv1.ClusterSpec) error { - logger.Infof("Configuring ceph connection CR %q in namespace %q", clusterInfo.NamespacedName().Name, clusterInfo.NamespacedName().Namespace) + // Create a cephconnection CR in the namespace of the operator, with the namespace of the cephcluster CR csiCephConnection := &csiopv1.CephConnection{} - - csiCephConnection.Name = clusterInfo.NamespacedName().Name + csiCephConnection.Name = clusterInfo.NamespacedName().Namespace csiCephConnection.Namespace = os.Getenv(k8sutil.PodNamespaceEnvVar) + logger.Infof("Configuring ceph connection CR %q in namespace %q", csiCephConnection.Name, csiCephConnection.Namespace) spec, err := generateCephConnSpec(c, clusterInfo, csiCephConnection.Spec, clusterSpec) if err != nil { diff --git a/pkg/operator/ceph/csi/ceph_connection_test.go b/pkg/operator/ceph/csi/ceph_connection_test.go index aa4c3b633..8bc5b7304 100644 --- a/pkg/operator/ceph/csi/ceph_connection_test.go +++ b/pkg/operator/ceph/csi/ceph_connection_test.go @@ -69,7 +69,7 @@ func TestCreateUpdateCephConnection(t *testing.T) { assert.NoError(t, err) // When no RBDMirror is created - err = cl.Get(context.TODO(), types.NamespacedName{Name: c.NamespacedName().Name, Namespace: c.NamespacedName().Namespace}, csiCephConnection) + err = cl.Get(context.TODO(), types.NamespacedName{Name: ns, Namespace: ns}, csiCephConnection) assert.NoError(t, err) assert.Equal(t, csiCephConnection.Spec.RbdMirrorDaemonCount, 0) @@ -96,7 +96,7 @@ func TestCreateUpdateCephConnection(t *testing.T) { assert.NoError(t, err) // When RBDMirror is created - err = cl.Get(context.TODO(), types.NamespacedName{Name: c.NamespacedName().Name, Namespace: c.NamespacedName().Namespace}, csiCephConnection) + err = cl.Get(context.TODO(), types.NamespacedName{Name: ns, Namespace: ns}, csiCephConnection) assert.NoError(t, err) assert.Equal(t, 1, csiCephConnection.Spec.RbdMirrorDaemonCount) }