From d1b44857adbe55f6715bb1d3f1b6fc40f625aeba Mon Sep 17 00:00:00 2001 From: saad-ali Date: Wed, 21 Nov 2018 15:26:12 -0800 Subject: [PATCH] Add missing feature gate to CSI driver uninstall --- pkg/volume/csi/nodeinfomanager/nodeinfomanager.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/volume/csi/nodeinfomanager/nodeinfomanager.go b/pkg/volume/csi/nodeinfomanager/nodeinfomanager.go index a61e2204653..099edaed2a6 100644 --- a/pkg/volume/csi/nodeinfomanager/nodeinfomanager.go +++ b/pkg/volume/csi/nodeinfomanager/nodeinfomanager.go @@ -133,13 +133,14 @@ func (nim *nodeInfoManager) InstallCSIDriver(driverName string, driverNodeID str // If multiple calls to UninstallCSIDriver() are made in parallel, some calls might receive Node or // CSINodeInfo update conflicts, which causes the function to retry the corresponding update. func (nim *nodeInfoManager) UninstallCSIDriver(driverName string) error { - // TODO: shouldn't this be feature gated? - err := nim.uninstallDriverFromCSINodeInfo(driverName) - if err != nil { - return fmt.Errorf("error uninstalling CSI driver from CSINodeInfo object %v", err) + if utilfeature.DefaultFeatureGate.Enabled(features.CSINodeInfo) { + err := nim.uninstallDriverFromCSINodeInfo(driverName) + if err != nil { + return fmt.Errorf("error uninstalling CSI driver from CSINodeInfo object %v", err) + } } - err = nim.updateNode( + err := nim.updateNode( removeMaxAttachLimit(driverName), removeNodeIDFromNode(driverName), )