Do not enable snapshotmetadata service by default

Signed-off-by: Prasad Ghangal <[email protected]>

Author: PrasadG193

cmd/hostpathplugin/main.go

@@ -55,6 +55,8 @@ func main() {
 
 	flag.BoolVar(&cfg.EnableVolumeExpansion, "enable-volume-expansion", true, "Enables volume expansion feature.")
 	flag.BoolVar(&cfg.EnableControllerModifyVolume, "enable-controller-modify-volume", false, "Enables Controller modify volume feature.")
+	// TODO: Remove this feature flag and enable SnapshotMetadata service by default once external-snapshot-metadata alpha is released.
+	flag.BoolVar(&cfg.EnableSnapshotMetadata, "enable-snapshot-metadata", false, "Enables Snapshot Metadata service.")
 	flag.Var(&cfg.AcceptedMutableParameterNames, "accepted-mutable-parameter-names", "Comma separated list of parameter names that can be modified on a persistent volume. This is only used when enable-controller-modify-volume is true. If unset, all parameters are mutable.")
 	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.")

pkg/hostpath/hostpath.go

@@ -81,6 +81,7 @@ type Config struct {
 	EnableTopology                bool
 	EnableVolumeExpansion         bool
 	EnableControllerModifyVolume  bool
+	EnableSnapshotMetadata        bool
 	AcceptedMutableParameterNames StringArray
 	DisableControllerExpansion    bool
 	DisableNodeExpansion          bool
@@ -130,8 +131,13 @@ func NewHostPathDriver(cfg Config) (*hostPath, error) {
 
 func (hp *hostPath) Run() error {
 	s := NewNonBlockingGRPCServer()
-	// hp itself implements ControllerServer, NodeServer, and IdentityServer.
-	s.Start(hp.config.Endpoint, hp, hp, hp, hp, hp)
+	// hp itself implements ControllerServer, NodeServer, IdentityServer, and SnapshotMetadataServer.
+	// TODO: Enable SnapshotMetadata service by default once external-snapshot-metadata alpha is released.
+	var sms csi.SnapshotMetadataServer
+	if hp.config.EnableSnapshotMetadata {
+		sms = hp
+	}
+	s.Start(hp.config.Endpoint, hp, hp, hp, hp, sms)
 	s.Wait()
 
 	return nil

pkg/hostpath/identityserver.go

@@ -62,19 +62,21 @@ func (hp *hostPath) GetPluginCapabilities(ctx context.Context, req *csi.GetPlugi
 				},
 			},
 		},
-		{
+	}
+	if hp.config.EnableTopology {
+		caps = append(caps, &csi.PluginCapability{
 			Type: &csi.PluginCapability_Service_{
 				Service: &csi.PluginCapability_Service{
-					Type: csi.PluginCapability_Service_SNAPSHOT_METADATA_SERVICE,
+					Type: csi.PluginCapability_Service_VOLUME_ACCESSIBILITY_CONSTRAINTS,
 				},
 			},
-		},
+		})
 	}
-	if hp.config.EnableTopology {
+	if hp.config.EnableSnapshotMetadata {
 		caps = append(caps, &csi.PluginCapability{
 			Type: &csi.PluginCapability_Service_{
 				Service: &csi.PluginCapability_Service{
-					Type: csi.PluginCapability_Service_VOLUME_ACCESSIBILITY_CONSTRAINTS,
+					Type: csi.PluginCapability_Service_SNAPSHOT_METADATA_SERVICE,
 				},
 			},
 		})