Merge pull request #67360 from jiaxuanzhou/1.11

simplify logic for func BuildArgumentListFromMap

cmd/kubeadm/app/util/arguments.go

@@ -30,26 +30,26 @@ import (
 func BuildArgumentListFromMap(baseArguments map[string]string, overrideArguments map[string]string) []string {
 	var command []string
 	var keys []string
-	for k := range overrideArguments {
+
+	argsMap := make(map[string]string)
+
+	for k, v := range baseArguments {
+		argsMap[k] = v
+	}
+
+	for k, v := range overrideArguments {
+		argsMap[k] = v
+	}
+
+	for k := range argsMap {
 		keys = append(keys, k)
 	}
+
 	sort.Strings(keys)
 	for _, k := range keys {
-		v := overrideArguments[k]
-		// values of "" are allowed as well
-		command = append(command, fmt.Sprintf("--%s=%s", k, v))
-	}
-	keys = []string{}
-	for k := range baseArguments {
-		keys = append(keys, k)
-	}
-	sort.Strings(keys)
-	for _, k := range keys {
-		v := baseArguments[k]
-		if _, overrideExists := overrideArguments[k]; !overrideExists {
-			command = append(command, fmt.Sprintf("--%s=%s", k, v))
-		}
+		command = append(command, fmt.Sprintf("--%s=%s", k, argsMap[k]))
 	}
+
 	return command
 }
 

cmd/kubeadm/app/util/arguments_test.go

@@ -85,9 +85,9 @@ func TestBuildArgumentListFromMap(t *testing.T) {
 			},
 			expected: []string{
 				"--admission-control=NamespaceLifecycle,LimitRanger",
-				"--something-that-allows-empty-string=",
 				"--allow-privileged=true",
 				"--insecure-bind-address=127.0.0.1",
+				"--something-that-allows-empty-string=",
 			},
 		},
 	}