pool: rbd cmd shouldn't use admin in external mode

when creating networkFence, rbd command was loading
admin config and hence running rbd command use client.admin
in case of external cluster also. With this commit instead
of client.admin user it will use what is being passed to
config.

Signed-off-by: subhamkrai <srai@redhat.com>
(cherry picked from commit ef4dd76df1)
This commit is contained in:
subhamkrai authored and Mergify committed 2023-10-27 16:23:54 +00:00
1 parent b615308b97
commit 214b109f23
2 files changed
+22 -2

No files matched your search

+4 -1
View File
@@ -219,7 +219,10 @@ func (c *clientCluster) fenceNode(ctx context.Context, node *corev1.Node, cluste
return nil
}
clusterInfo := cephclient.AdminClusterInfo(ctx, cluster.Namespace, cluster.Name)
clusterInfo, _, _, err := opcontroller.LoadClusterInfo(c.context, ctx, cluster.Namespace, &cluster.Spec)
if err != nil {
return pkgerror.Wrapf(err, "Failed to load cluster info.")
}
for i := range rbdPVList {
err = c.fenceRbdImage(ctx, node, cluster, clusterInfo, rbdPVList[i])
+18 -1
View File
@@ -271,7 +271,24 @@ func TestHandleNodeFailure(t *testing.T) {
},
}
_, err := c.context.Clientset.CoreV1().PersistentVolumes().Create(ctx, pv, metav1.CreateOptions{})
// Mock clusterInfo
secrets := map[string][]byte{
"fsid": []byte("c47cac40-9bee-4d52-823b-ccd803ba5bfe"),
"mon-secret": []byte("monsecret"),
"admin-secret": []byte("adminsecret"),
}
secret := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: "rook-ceph-mon",
Namespace: ns,
},
Data: secrets,
Type: k8sutil.RookType,
}
_, err := c.context.Clientset.CoreV1().Secrets(ns).Create(ctx, secret, metav1.CreateOptions{})
assert.NoError(t, err)
_, err = c.context.Clientset.CoreV1().PersistentVolumes().Create(ctx, pv, metav1.CreateOptions{})
assert.NoError(t, err)
_, err = c.context.ApiExtensionsClient.ApiextensionsV1().CustomResourceDefinitions().Create(ctx, &v1.CustomResourceDefinition{ObjectMeta: metav1.ObjectMeta{Name: "networkfences.csiaddons.openshift.io"}}, metav1.CreateOptions{})