pass machine-type and disable-autoconfig flag to gcsfuse

Author: hungnguyen243

cmd/sidecar_mounter/main.go

@@ -28,15 +28,17 @@ import (
 	"syscall"
 	"time"
 
+	driver "github.com/googlecloudplatform/gcs-fuse-csi-driver/pkg/csi_driver"
 	sidecarmounter "github.com/googlecloudplatform/gcs-fuse-csi-driver/pkg/sidecar_mounter"
 	"github.com/googlecloudplatform/gcs-fuse-csi-driver/pkg/webhook"
 	"k8s.io/klog/v2"
 )
 
 var (
-	gcsfusePath    = flag.String("gcsfuse-path", "/gcsfuse", "gcsfuse path")
-	volumeBasePath = flag.String("volume-base-path", webhook.SidecarContainerTmpVolumeMountPath+"/.volumes", "volume base path")
-	_              = flag.Int("grace-period", 0, "grace period for gcsfuse termination. This flag has been deprecated, has no effect and will be removed in the future.")
+	gcsfusePath       = flag.String("gcsfuse-path", "/gcsfuse", "gcsfuse path")
+	volumeBasePath    = flag.String("volume-base-path", webhook.SidecarContainerTmpVolumeMountPath+"/.volumes", "volume base path")
+	disableAutoConfig = flag.Bool("disable-autoconfig", true, "disable defaulting configurations")
+	_                 = flag.Int("grace-period", 0, "grace period for gcsfuse termination. This flag has been deprecated, has no effect and will be removed in the future.")
 	// This is set at compile time.
 	version = "unknown"
 )
@@ -55,13 +57,28 @@ func main() {
 	mounter := sidecarmounter.New(*gcsfusePath)
 	ctx, cancel := context.WithCancel(context.Background())
 
+	machineType := ""
+	volumePath := *volumeBasePath + driver.MachineTypePath
+	klog.Infof("Checking if machine-type file exists: %v", volumePath)
+	if _, err := os.Stat(volumePath); err == nil {
+		machineTypeBytes, err := os.ReadFile(volumePath)
+		if err != nil {
+			klog.Fatalf("failed to read machine-type file: %v", err)
+		}
+		machineType = string(machineTypeBytes)
+	}
+
 	for _, sp := range socketPaths {
 		// sleep 1.5 seconds before launch the next gcsfuse to avoid
 		// 1. different gcsfuse logs mixed together.
 		// 2. memory usage peak.
 		time.Sleep(1500 * time.Millisecond)
 		mc := sidecarmounter.NewMountConfig(sp)
 		if mc != nil {
+			// TODO: Pass machine-type to gcsfuse binary
+			klog.Infof("Setting machine type to gcsfuse binary %v", machineType)
+			mc.FlagMap["machine-type"] = machineType
+			mc.FlagMap["disable-autoconfig"] = strconv.FormatBool(*disableAutoConfig)
 			if err := mounter.Mount(ctx, mc); err != nil {
 				mc.ErrWriter.WriteMsg(fmt.Sprintf("failed to mount bucket %q for volume %q: %v\n", mc.BucketName, mc.VolumeName, err))
 			}

pkg/cloud_provider/clientset/clientset.go

@@ -59,6 +59,7 @@ type Clientset struct {
 }
 
 const GkeMetaDataServerKey = "iam.gke.io/gke-metadata-server-enabled"
+const MachineTypeKey = "node.kubernetes.io/instance-type"
 
 func (c *Clientset) ConfigureNodeLister(nodeName string) {
 	trim := func(obj interface{}) (interface{}, error) {
@@ -81,6 +82,10 @@ func (c *Clientset) ConfigureNodeLister(nodeName string) {
 		if ok {
 			newLabels[GkeMetaDataServerKey] = isGkeMetaDataServerEnabled
 		}
+		machineType, ok := nodeObj.ObjectMeta.Labels[MachineTypeKey]
+		if ok {
+			newLabels[MachineTypeKey] = machineType
+		}
 
 		nodeObj.Spec = corev1.NodeSpec{}
 		nodeObj.Status = corev1.NodeStatus{}

pkg/csi_driver/node.go

@@ -181,6 +181,14 @@ func (s *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublish
 		}
 	}
 
+	machineType, ok := node.Labels[clientset.MachineTypeKey]
+	if ok {
+		klog.V(1).Infof("Putting machine-type file to %v: %v", targetPath, machineType)
+		if err := putMachineTypeFile(machineType, targetPath); err != nil {
+			return nil, status.Error(codes.Internal, err.Error())
+		}
+	}
+
 	// Check if there is any error from the gcsfuse
 	code, err := checkGcsFuseErr(isInitContainer, pod, targetPath)
 	if code != codes.OK {

pkg/csi_driver/utils.go

@@ -66,6 +66,7 @@ const (
 	VolumeContextKeyEphemeral           = "csi.storage.k8s.io/ephemeral"
 	VolumeContextKeyBucketName          = "bucketName"
 	tokenServerSidecarMinVersion        = "v1.12.2-gke.0" // #nosec G101
+	MachineTypePath                     = "/machine-type"
 )
 
 func NewVolumeCapabilityAccessMode(mode csi.VolumeCapability_AccessMode_Mode) *csi.VolumeCapability_AccessMode {
@@ -484,3 +485,29 @@ func isSidecarVersionSupportedForTokenServer(imageName string) bool {
 
 	return false
 }
+
+func putMachineTypeFile(machineType string, targetPath string) error {
+	emptyDirBasePath, err := util.PrepareEmptyDir(targetPath, true)
+	if err != nil {
+		return fmt.Errorf("failed to get emptyDir path: %w", err)
+	}
+
+	machineTypeFilePath := filepath.Dir(emptyDirBasePath) + MachineTypePath
+
+	f, err := os.Create(machineTypeFilePath)
+	if err != nil {
+		return fmt.Errorf("failed to put the machine-type file: %w", err)
+	}
+	if _, err := f.WriteString(machineType); err != nil {
+		return fmt.Errorf("failed to write machine-type file: %w", err)
+	}
+
+	f.Close()
+
+	err = os.Chown(machineTypeFilePath, webhook.NobodyUID, webhook.NobodyGID)
+	if err != nil {
+		return fmt.Errorf("failed to change ownership on the machine-type file: %w", err)
+	}
+
+	return nil
+}