Remove attachable volume limit from node's status capacity if they exists

carlory · carlory · commit 47eed55a6648 · 2024-09-18T11:09:53.000+08:00
diff --git a/pkg/volume/csi/nodeinfomanager/nodeinfomanager.go b/pkg/volume/csi/nodeinfomanager/nodeinfomanager.go
@@ -112,6 +112,7 @@ func (nim *nodeInfoManager) InstallCSIDriver(driverName string, driverNodeID str
 	}
 
 	nodeUpdateFuncs := []nodeUpdateFunc{
+		removeMaxAttachLimit(driverName), // remove in 1.35 due to the version skew policy, we have to keep it for 3 releases
 		updateNodeIDInNode(driverName, driverNodeID),
 		updateTopologyLabels(topology),
 	}
@@ -140,7 +141,7 @@ func (nim *nodeInfoManager) UninstallCSIDriver(driverName string) error {
 	}
 
 	err = nim.updateNode(
-		removeMaxAttachLimit(driverName),
+		removeMaxAttachLimit(driverName), // remove it when this function is removed from nodeUpdateFuncs
 		removeNodeIDFromNode(driverName),
 	)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,7 @@ func (nim *nodeInfoManager) InstallCSIDriver(driverName string, driverNodeID str`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`nodeUpdateFuncs := []nodeUpdateFunc{`
	`115`	`+ removeMaxAttachLimit(driverName), // remove in 1.35 due to the version skew policy, we have to keep it for 3 releases`
`115`	`116`	`updateNodeIDInNode(driverName, driverNodeID),`
`116`	`117`	`updateTopologyLabels(topology),`
`117`	`118`	`}`
`@@ -140,7 +141,7 @@ func (nim *nodeInfoManager) UninstallCSIDriver(driverName string) error {`
`140`	`141`	`}`
`141`	`142`
`142`	`143`	`err = nim.updateNode(`
`143`		`- removeMaxAttachLimit(driverName),`
	`144`	`+ removeMaxAttachLimit(driverName), // remove it when this function is removed from nodeUpdateFuncs`
`144`	`145`	`removeNodeIDFromNode(driverName),`
`145`	`146`	`)`
`146`	`147`	`if err != nil {`