Skip to content

cleanup csi.volume.kubernetes.io/nodeid #691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 1 commit into from
Jan 12, 2026
+0 −19
Merged

cleanup csi.volume.kubernetes.io/nodeid #691

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions pkg/controller/csi_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,14 +211,6 @@ func node() *v1.Node {
}
}

func nodeWithAnnotations() *v1.Node {
node := node()
node.Annotations = map[string]string{
"csi.volume.kubernetes.io/nodeid": fmt.Sprintf("{ %q: %q }", testAttacherName, testNodeID),
}
return node
}

func csiNode() *storage.CSINode {
return &storage.CSINode{
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -887,17 +879,6 @@ func TestCSIHandler(t *testing.T) {
vaWithAttachError(va(false, fin, ann), "csinode.storage.k8s.io \"node1\" not found")), "status"),
},
},
{
name: "Node with annotations, CSINode is absent -> error",
initialObjects: []runtime.Object{pvWithFinalizer(), nodeWithAnnotations()},
addedVA: va(false, fin, ann),
expectedActions: []core.Action{
core.NewPatchSubresourceAction(vaGroupResourceVersion, metav1.NamespaceNone, testPVName+"-"+testNodeName,
types.MergePatchType, patch(va(false /*attached*/, fin, ann),
vaWithAttachError(va(false, fin, ann), "csinode.storage.k8s.io \"node1\" not found")),
"status"),
},
},
{
name: "CSINode exists without the driver -> error",
initialObjects: []runtime.Object{pvWithFinalizer(), csiNodeEmpty()},
Expand Down