pkg: flagcodec: always use normalization

Always enable normalization in the deployer codebase. The golang flag package also allows single or double dash for single-letter flags: https://pkg.go.dev/flag#hdr-Command_line_flag_syntax Signed-off-by: Francesco Romani <[email protected]>
k8stopologyawareschedwg · Nov 29, 2023 · 99b7fc6 · 99b7fc6
1 parent c600f30
commit 99b7fc6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/pkg/manifests/yaml/sched/scheduler/deployment.yaml b/pkg/manifests/yaml/sched/scheduler/deployment.yaml
@@ -20,7 +20,7 @@ spec:
       - args:
         - /bin/kube-scheduler
         - --config=/etc/kubernetes/scheduler-config.yaml
-        - --v=4
+        - -v=4
         image: k8s.gcr.io/scheduler-plugins/kube-scheduler:v0.24.9
         livenessProbe:
           httpGet:

diff --git a/pkg/objectupdate/nfd/nfd.go b/pkg/objectupdate/nfd/nfd.go
@@ -36,7 +36,7 @@ func UpdaterDaemonSet(ds *appsv1.DaemonSet, opts objectupdate.DaemonSetOptions)
 			c.ImagePullPolicy = corev1.PullIfNotPresent
 		}
 
-		flags := flagcodec.ParseArgvKeyValue(c.Args)
+		flags := flagcodec.ParseArgvKeyValue(c.Args, flagcodec.WithFlagNormalization)
 		flags.SetOption("-v", fmt.Sprintf("%d", opts.Verbose))
 		if opts.UpdateInterval > 0 {
 			flags.SetOption("--sleep-interval", fmt.Sprintf("%v", opts.UpdateInterval))

diff --git a/pkg/objectupdate/rte/rte.go b/pkg/objectupdate/rte/rte.go
@@ -122,7 +122,7 @@ func DaemonSet(ds *appsv1.DaemonSet, plat platform.Platform, configMapName strin
 			})
 		}
 
-		flags := flagcodec.ParseArgvKeyValue(cntSpec.Args)
+		flags := flagcodec.ParseArgvKeyValue(cntSpec.Args, flagcodec.WithFlagNormalization)
 		flags.SetOption("-v", fmt.Sprintf("%d", opts.Verbose))
 		if opts.UpdateInterval > 0 {
 			flags.SetOption("--sleep-interval", fmt.Sprintf("%v", opts.UpdateInterval))

diff --git a/pkg/objectupdate/sched/sched.go b/pkg/objectupdate/sched/sched.go
@@ -33,8 +33,8 @@ func SchedulerDeployment(dp *appsv1.Deployment, pullIfNotPresent, ctrlPlaneAffin
 	cnt.Image = images.SchedulerPluginSchedulerImage
 	cnt.ImagePullPolicy = pullPolicy(pullIfNotPresent)
 
-	flags := flagcodec.ParseArgvKeyValue(cnt.Args)
-	flags.SetOption("--v", fmt.Sprintf("%d", verbose)) // TODO: keep in sync with the manifest (-v vs --v)
+	flags := flagcodec.ParseArgvKeyValue(cnt.Args, flagcodec.WithFlagNormalization)
+	flags.SetOption("-v", fmt.Sprintf("%d", verbose))
 	cnt.Args = flags.Argv()
 
 	if ctrlPlaneAffinity {

diff --git a/pkg/objectupdate/sched/sched_test.go b/pkg/objectupdate/sched/sched_test.go
@@ -115,7 +115,7 @@ spec:
       - args:
         - /bin/kube-scheduler
         - --config=/etc/kubernetes/scheduler-config.yaml
-        - --v=4
+        - -v=4
         image: test.com/image:latest
         imagePullPolicy: Always
         livenessProbe:
@@ -176,7 +176,7 @@ spec:
       - args:
         - /bin/kube-scheduler
         - --config=/etc/kubernetes/scheduler-config.yaml
-        - --v=4
+        - -v=4
         image: test.com/image:latest
         imagePullPolicy: Always
         livenessProbe:
@@ -239,7 +239,7 @@ spec:
       - args:
         - /bin/kube-scheduler
         - --config=/etc/kubernetes/scheduler-config.yaml
-        - --v=6
+        - -v=6
         image: test.com/image:latest
         imagePullPolicy: Always
         livenessProbe: