resolve comments partially

Author: hungnguyen243

cmd/sidecar_mounter/main.go

@@ -57,8 +57,8 @@ func main() {
 	ctx, cancel := context.WithCancel(context.Background())
 
 	flagsFromDriver := map[string]string{}
-	defaultingFlagFilePath := *volumeBasePath + driver.FlagFileForDefaultingPath
-	klog.Infof("Checking if defaulting-flag file exists: %v", defaultingFlagFilePath)
+	defaultingFlagFilePath := *volumeBasePath + "/" + driver.FlagFileForDefaultingPath
+	klog.Infof("Checking if defaulting-flag file %q exists", defaultingFlagFilePath)
 	if _, err := os.Stat(defaultingFlagFilePath); err == nil {
 		machineTypeBytes, err := os.ReadFile(defaultingFlagFilePath)
 		if err != nil {

pkg/csi_driver/node.go

@@ -184,18 +184,18 @@ func (s *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublish
 	}
 
 	// Only pass mountOptions flags for defaulting if sidecar container is managed and satisifies min version requirement
-	if s.shouldPassDefaultingFlags(pod) {
-		shouldDisableAutoConfig := s.driver.config.DisableAutoconfig
-		machineType, ok := node.Labels[clientset.MachineTypeKey]
-		if ok {
-			flagMap := map[string]string{"machine-type": machineType, "disable-autoconfig": strconv.FormatBool(shouldDisableAutoConfig)}
-			if err := PutFlagsFromDriverToTargetPath(flagMap, targetPath, FlagFileForDefaultingPath); err != nil {
-				return nil, status.Error(codes.Internal, err.Error())
-			}
-		} else {
-			klog.Warningf("Unable to fetch target node %v's machine type", node.Name)
+	// if s.shouldPassDefaultingFlags(pod) {
+	shouldDisableAutoConfig := s.driver.config.DisableAutoconfig
+	machineType, ok := node.Labels[clientset.MachineTypeKey]
+	if ok {
+		flagMap := map[string]string{"machine-type": machineType, "disable-autoconfig": strconv.FormatBool(shouldDisableAutoConfig)}
+		if err := PutFlagsFromDriverToTargetPath(flagMap, targetPath, FlagFileForDefaultingPath); err != nil {
+			return nil, status.Error(codes.Internal, err.Error())
 		}
+	} else {
+		klog.Warningf("Unable to fetch target node %v's machine type", node.Name)
 	}
+	// }
 
 	// Check if there is any error from the gcsfuse
 	code, err := checkGcsFuseErr(isInitContainer, pod, targetPath)

pkg/csi_driver/utils.go

@@ -68,7 +68,7 @@ const (
 	tokenServerSidecarMinVersion        = "v1.12.2-gke.0" // #nosec G101
 	// TODO: Update with actual minimum sidecar version after the first feature release
 	AutoconfigDefaultingSidecarMinVersion = "v1.99.0-gke.0"
-	FlagFileForDefaultingPath             = "/flags-for-defaulting"
+	FlagFileForDefaultingPath             = "flags-for-defaulting"
 )
 
 var volumeIDRegEx = regexp.MustCompile(`:.*$`)
@@ -504,8 +504,8 @@ func PutFlagsFromDriverToTargetPath(flagMap map[string]string, targetPath string
 		return fmt.Errorf("failed to get emptyDir path: %w", err)
 	}
 
-	absolutePath := filepath.Dir(emptyDirBasePath) + fileName
-	klog.V(4).Infof("Writing flags needed for gcsfuse defaulting logic to file %v: %v", absolutePath, flagMap)
+	absolutePath := filepath.Dir(emptyDirBasePath) + "/" + fileName
+	klog.V(4).Infof("Writing flags needed for gcsfuse defaulting logic to file %q: %v", absolutePath, flagMap)
 
 	f, err := os.Create(absolutePath)
 	if err != nil {

test/e2e/specs/specs.go

@@ -1259,7 +1259,7 @@ func (t *TestPod) VerifyDefaultingFlagsArePassed(namespace string, expectedMachi
 	expectedMachineTypeFlagString := fmt.Sprintf(`"MachineType":"%s"`, expectedMachineTypeFlag)
 
 	gomega.Expect(stdout).To(gomega.ContainSubstring(expectedDisableAutoconfigFlagString),
-		"Should find DisableAutoconfig flag string %q in stdout:\n%s", expectedDisableAutoconfigFlagString, stdout)
+		"Should find DisableAutoconfig flag string %q in stdout", expectedDisableAutoconfigFlagString)
 	gomega.Expect(stdout).To(gomega.ContainSubstring(expectedMachineTypeFlagString),
-		"Should find MachineType flag string %q in stdout:\n%s", expectedMachineTypeFlagString, stdout)
+		"Should find MachineType flag string %q in stdout", expectedMachineTypeFlagString)
 }