Merge pull request #1086 from jdnurme/custom-endpoint-fix

add fix and corresponding tests

Author: amacaskill

pkg/sidecar_mounter/sidecar_mounter_config.go

@@ -206,10 +206,18 @@ func (mc *MountConfig) prepareMountArgs() {
 	for _, arg := range mc.Options {
 		klog.Infof("processing mount arg %v", arg)
 
-		if strings.Contains(arg, ":") && !strings.Contains(arg, "https") {
-			i := strings.LastIndex(arg, ":")
-			f, v := arg[:i], arg[i+1:]
-
+		// Config file flags are identified by not containing '=' and containing ':'.
+		// e.g., "logging:severity:error"
+		if !strings.Contains(arg, "=") && strings.Contains(arg, ":") && !strings.Contains(arg, "https") {
+			var f, v string
+			if strings.HasPrefix(arg, "gcs-connection:custom-endpoint:") {
+				parts := strings.SplitN(arg, ":", 3)
+				f = parts[0] + ":" + parts[1]
+				v = parts[2]
+			} else {
+				i := strings.LastIndex(arg, ":")
+				f, v = arg[:i], arg[i+1:]
+			}
 			if f == util.DisableMetricsForGKE {
 				if v == util.TrueStr {
 					flagMap["prometheus-port"] = "0"

pkg/sidecar_mounter/sidecar_mounter_config_test.go

@@ -301,6 +301,43 @@ func TestPrepareMountArgs(t *testing.T) {
 				"cache-dir":         "/gcsfuse-file-cache-ephemeral-disk/.volumes/volume-name",
 			},
 		},
+		{
+			name: "should correctly parse custom-endpoint with a port",
+			mc: &MountConfig{
+				BucketName: "test-bucket",
+				BufferDir:  "test-buffer-dir",
+				CacheDir:   "test-cache-dir",
+				ConfigFile: "test-config-file",
+				Options:    []string{"gcs-connection:custom-endpoint:custom-service.my-system.svc.cluster.local:8080"},
+			},
+			expectedArgs: defaultFlagMap,
+			expectedConfigMapArgs: map[string]string{
+				"logging:file-path":              "/dev/fd/1",
+				"logging:format":                 "json",
+				"cache-dir":                      "",
+				"gcs-connection:custom-endpoint": "custom-service.my-system.svc.cluster.local:8080",
+			},
+		},
+		{
+			name: "should correctly parse custom-endpoint with a port in CLI format",
+			mc: &MountConfig{
+				BucketName: "test-bucket",
+				BufferDir:  "test-buffer-dir",
+				CacheDir:   "test-cache-dir",
+				ConfigFile: "test-config-file",
+				Options:    []string{"custom-endpoint=custom-service.my-system.svc.cluster.local:8080"},
+			},
+			expectedArgs: map[string]string{
+				"app-name":        GCSFuseAppName,
+				"temp-dir":        "test-buffer-dir/temp-dir",
+				"config-file":     "test-config-file",
+				"foreground":      "",
+				"uid":             "0",
+				"gid":             "0",
+				"custom-endpoint": "custom-service.my-system.svc.cluster.local:8080",
+			},
+			expectedConfigMapArgs: defaultConfigFileFlagMap,
+		},
 	}
 
 	testPrometheusPort := prometheusPort