Merge pull request #578 from GoogleCloudPlatform/revert-575-automated-cherry-pick-of-#574-upstream-release-1.14

Revert "Automated cherry pick of #574: Enable metrics collection by default on gcsfusecsi sidecar."

Author: amacaskill

pkg/sidecar_mounter/sidecar_mounter_config.go

@@ -154,16 +154,13 @@ func NewMountConfig(sp string) *MountConfig {
 
 func (mc *MountConfig) prepareMountArgs() {
 	flagMap := map[string]string{
-		"app-name":        GCSFuseAppName,
-		"temp-dir":        mc.BufferDir + TempDir,
-		"config-file":     mc.ConfigFile,
-		"foreground":      "",
-		"uid":             "0",
-		"gid":             "0",
-		"prometheus-port": strconv.Itoa(prometheusPort),
+		"app-name":    GCSFuseAppName,
+		"temp-dir":    mc.BufferDir + TempDir,
+		"config-file": mc.ConfigFile,
+		"foreground":  "",
+		"uid":         "0",
+		"gid":         "0",
 	}
-	// Use a new port each gcsfuse instance that we start.
-	prometheusPort++
 
 	configFileFlagMap := map[string]string{
 		"logging:file-path": "/dev/fd/1", // redirect the output to cmd stdout
@@ -179,8 +176,10 @@ func (mc *MountConfig) prepareMountArgs() {
 			f, v := arg[:i], arg[i+1:]
 
 			if f == util.DisableMetricsForGKE {
-				if v == util.TrueStr {
-					flagMap["prometheus-port"] = "0"
+				if v == util.FalseStr {
+					flagMap["prometheus-port"] = strconv.Itoa(prometheusPort)
+					// Use a new port each gcsfuse instance that we start.
+					prometheusPort++
 				}
 
 				continue

pkg/sidecar_mounter/sidecar_mounter_config_test.go

@@ -20,7 +20,6 @@ package sidecarmounter
 import (
 	"os"
 	"reflect"
-	"slices"
 	"strconv"
 	"testing"
 
@@ -221,7 +220,7 @@ func TestPrepareMountArgs(t *testing.T) {
 				BufferDir:  "test-buffer-dir",
 				CacheDir:   "test-cache-dir",
 				ConfigFile: "test-config-file",
-				Options:    []string{util.DisableMetricsForGKE + ":true"},
+				Options:    []string{util.DisableMetricsForGKE + ":false"},
 			},
 			expectedArgs: map[string]string{
 				"app-name":        GCSFuseAppName,
@@ -234,37 +233,25 @@ func TestPrepareMountArgs(t *testing.T) {
 			},
 			expectedConfigMapArgs: defaultConfigFileFlagMap,
 		},
-		{
-			name: "should return valid args when metrics is enabled",
-			mc: &MountConfig{
-				BucketName: "test-bucket",
-				BufferDir:  "test-buffer-dir",
-				CacheDir:   "test-cache-dir",
-				ConfigFile: "test-config-file",
-				Options:    []string{util.DisableMetricsForGKE + ":false"},
-			},
-			expectedArgs: map[string]string{
-				"app-name":    GCSFuseAppName,
-				"temp-dir":    "test-buffer-dir/temp-dir",
-				"config-file": "test-config-file",
-				"foreground":  "",
-				"uid":         "0",
-				"gid":         "0",
-			},
-			expectedConfigMapArgs: defaultConfigFileFlagMap,
-		},
 	}
 
-	testPrometheusPort := prometheusPort
+	prometheusPort := 62990
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			// Do not parallelize [e.g t.Parallel()] because all testcases share testPrometheusPort.
-			found := slices.Contains(tc.mc.Options, util.DisableMetricsForGKE+":true")
-			if !found {
-				tc.expectedArgs["prometheus-port"] = strconv.Itoa(testPrometheusPort)
+			t.Parallel()
+			found := false
+			for _, o := range tc.mc.Options {
+				if o == util.DisableMetricsForGKE+":false" {
+					found = true
+
+					break
+				}
+			}
+
+			if found {
+				tc.expectedArgs["prometheus-port"] = strconv.Itoa(prometheusPort)
+				prometheusPort++
 			}
-			// Increase port value to match behavior of prepareMountArgs()
-			testPrometheusPort++
 
 			tc.mc.prepareMountArgs()
 			if !reflect.DeepEqual(tc.mc.FlagMap, tc.expectedArgs) {