Merge pull request #344 from gnufied/fix-host-path-expansion-options

Fix options for volume expansion

Author: k8s-ci-robot

cmd/hostpathplugin/main.go

@@ -55,7 +55,13 @@ func main() {
 	flag.BoolVar(&cfg.CheckVolumeLifecycle, "check-volume-lifecycle", false, "Can be used to turn some violations of the volume lifecycle into warnings instead of failing the incorrect gRPC call. Disabled by default because of https://github.com/kubernetes/kubernetes/issues/101911.")
 	flag.Int64Var(&cfg.MaxVolumeSize, "max-volume-size", 1024*1024*1024*1024, "maximum size of volumes in bytes (inclusive)")
 	flag.BoolVar(&cfg.EnableTopology, "enable-topology", true, "Enables PluginCapability_Service_VOLUME_ACCESSIBILITY_CONSTRAINTS capability.")
-	flag.BoolVar(&cfg.EnableVolumeExpansion, "node-expand-required", true, "Enables NodeServiceCapability_RPC_EXPAND_VOLUME capacity.")
+	flag.BoolVar(&cfg.EnableVolumeExpansion, "node-expand-required", true, "Enables volume expansion capability of the plugin(Deprecated). Please use enable-volume-expansion flag.")
+
+	flag.BoolVar(&cfg.EnableVolumeExpansion, "enable-volume-expansion", true, "Enables volume expansion feature.")
+	flag.BoolVar(&cfg.DisableControllerExpansion, "disable-controller-expansion", false, "Disables Controller volume expansion capability.")
+	flag.BoolVar(&cfg.DisableNodeExpansion, "disable-node-expansion", false, "Disables Node volume expansion capability.")
+	flag.Int64Var(&cfg.MaxVolumeExpansionSizeNode, "max-volume-size-node", 0, "Maximum allowed size of volume when expanded on the node. Defaults to same size as max-volume-size.")
+
 	flag.Int64Var(&cfg.AttachLimit, "attach-limit", 0, "Maximum number of attachable volumes on a node. Zero refers to no limit.")
 	showVersion := flag.Bool("version", false, "Show version.")
 	// The proxy-endpoint option is intended to used by the Kubernetes E2E test suite
@@ -97,6 +103,10 @@ func main() {
 		return
 	}
 
+	if cfg.MaxVolumeExpansionSizeNode == 0 {
+		cfg.MaxVolumeExpansionSizeNode = cfg.MaxVolumeSize
+	}
+
 	driver, err := hostpath.NewHostPathDriver(cfg)
 	if err != nil {
 		fmt.Printf("Failed to initialize driver: %s", err.Error())

pkg/hostpath/controllerserver.go

@@ -799,7 +799,7 @@ func (hp *hostPath) getControllerServiceCapabilities() []*csi.ControllerServiceC
 			csi.ControllerServiceCapability_RPC_VOLUME_CONDITION,
 			csi.ControllerServiceCapability_RPC_SINGLE_NODE_MULTI_WRITER,
 		}
-		if hp.config.EnableVolumeExpansion {
+		if hp.config.EnableVolumeExpansion && !hp.config.DisableControllerExpansion {
 			cl = append(cl, csi.ControllerServiceCapability_RPC_EXPAND_VOLUME)
 		}
 		if hp.config.EnableAttach {

pkg/hostpath/hostpath.go

@@ -59,22 +59,25 @@ type hostPath struct {
 }
 
 type Config struct {
-	DriverName            string
-	Endpoint              string
-	ProxyEndpoint         string
-	NodeID                string
-	VendorVersion         string
-	StateDir              string
-	MaxVolumesPerNode     int64
-	MaxVolumeSize         int64
-	AttachLimit           int64
-	Capacity              Capacity
-	Ephemeral             bool
-	ShowVersion           bool
-	EnableAttach          bool
-	EnableTopology        bool
-	EnableVolumeExpansion bool
-	CheckVolumeLifecycle  bool
+	DriverName                 string
+	Endpoint                   string
+	ProxyEndpoint              string
+	NodeID                     string
+	VendorVersion              string
+	StateDir                   string
+	MaxVolumesPerNode          int64
+	MaxVolumeSize              int64
+	AttachLimit                int64
+	Capacity                   Capacity
+	Ephemeral                  bool
+	ShowVersion                bool
+	EnableAttach               bool
+	EnableTopology             bool
+	EnableVolumeExpansion      bool
+	DisableControllerExpansion bool
+	DisableNodeExpansion       bool
+	MaxVolumeExpansionSizeNode int64
+	CheckVolumeLifecycle       bool
 }
 
 var (

pkg/hostpath/nodeserver.go

@@ -390,7 +390,7 @@ func (hp *hostPath) NodeGetCapabilities(ctx context.Context, req *csi.NodeGetCap
 			},
 		},
 	}
-	if hp.config.EnableVolumeExpansion {
+	if hp.config.EnableVolumeExpansion && !hp.config.DisableNodeExpansion {
 		caps = append(caps, &csi.NodeServiceCapability{
 			Type: &csi.NodeServiceCapability_Rpc{
 				Rpc: &csi.NodeServiceCapability_RPC{
@@ -480,6 +480,15 @@ func (hp *hostPath) NodeExpandVolume(ctx context.Context, req *csi.NodeExpandVol
 		return nil, status.Error(codes.InvalidArgument, "Volume path not provided")
 	}
 
+	capRange := req.GetCapacityRange()
+	if capRange == nil {
+		return nil, status.Error(codes.InvalidArgument, "Capacity range not provided")
+	}
+	capacity := int64(capRange.GetRequiredBytes())
+	if capacity > hp.config.MaxVolumeExpansionSizeNode {
+		return nil, status.Errorf(codes.OutOfRange, "Requested capacity %d exceeds maximum allowed %d", capacity, hp.config.MaxVolumeExpansionSizeNode)
+	}
+
 	info, err := os.Stat(volPath)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "Could not get file information from %s: %v", volPath, err)