Merge pull request #12681 from Madhu-1/fix-12645

csi: add mode csi pods to the list to force delete pod
This commit is contained in:
Travis Nielsen authored and GitHub committed 2023-08-08 11:10:43 -06:00
commit 3f01e8f7ec
2 files changed
+11 -1

No files matched your search

+5
View File
@@ -314,8 +314,13 @@ func (c *cephStatusChecker) getRookPodsOnNode(node string) ([]v1.Pod, error) {
appLabels := []string{
"csi-rbdplugin-provisioner",
"csi-rbdplugin",
"csi-rbdplugin-holder",
"csi-cephfsplugin-holder",
"csi-cephfsplugin-provisioner",
"csi-cephfsplugin",
"csi-nfsplugin-holder",
"csi-nfsplugin-provisioner",
"csi-nfsplugin",
"rook-ceph-operator",
"rook-ceph-mon",
"rook-ceph-osd",
+6 -1
View File
@@ -326,8 +326,13 @@ func TestGetRookPodsOnNode(t *testing.T) {
{"app": "rook-ceph-osd"},
{"app": "csi-rbdplugin-provisioner"},
{"app": "csi-rbdplugin"},
{"app": "csi-rbdplugin-holder"},
{"app": "csi-cephfsplugin-provisioner"},
{"app": "csi-cephfsplugin"},
{"app": "csi-cephfsplugin-holder"},
{"app": "csi-nfsplugin-provisioner"},
{"app": "csi-nfsplugin"},
{"app": "csi-nfsplugin-holder"},
{"app": "rook-ceph-operator"},
{"app": "rook-ceph-crashcollector"},
{"app": "rook-ceph-mgr"},
@@ -363,7 +368,7 @@ func TestGetRookPodsOnNode(t *testing.T) {
pods, err := c.getRookPodsOnNode("node0")
assert.NoError(t, err)
// A pod is having two matching labels and its returned only once
assert.Equal(t, 12, len(pods))
assert.Equal(t, 17, len(pods))
podNames := []string{}
for _, pod := range pods {