Merge pull request #5415 from twz123/confine-kubelet-root-dir

Narrow down kubelet-root-dir flag
k0sproject · Jan 8, 2025 · 960b539 · 960b539
2 parents 0c4f33e + 41c2fab
commit 960b539
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/cmd/reset/reset.go b/cmd/reset/reset.go
@@ -46,8 +46,12 @@ func NewResetCmd() *cobra.Command {
 		},
 	}
 	cmd.PersistentFlags().AddFlagSet(config.GetPersistentFlagSet())
-	cmd.Flags().AddFlagSet(config.GetCriSocketFlag())
-	cmd.Flags().AddFlagSet(config.FileInputFlag())
+
+	flags := cmd.Flags()
+	flags.AddFlagSet(config.GetCriSocketFlag())
+	flags.AddFlagSet(config.FileInputFlag())
+	flags.String("kubelet-root-dir", "", "Kubelet root directory for k0s")
+
 	return cmd
 }
 

diff --git a/pkg/config/cli.go b/pkg/config/cli.go
@@ -200,7 +200,6 @@ func GetPersistentFlagSet() *pflag.FlagSet {
 	flagset.BoolVarP(&Debug, "debug", "d", false, "Debug logging (default: false)")
 	flagset.BoolVarP(&Verbose, "verbose", "v", false, "Verbose logging (default: false)")
 	flagset.String("data-dir", constant.DataDirDefault, "Data Directory for k0s. DO NOT CHANGE for an existing setup, things will break!")
-	flagset.String("kubelet-root-dir", "", "Kubelet root directory for k0s")
 	flagset.StringVar(&StatusSocket, "status-socket", "", "Full file path to the socket file. (default: <rundir>/status.sock)")
 	flagset.StringVar(&DebugListenOn, "debugListenOn", ":6060", "Http listenOn for Debug pprof handler")
 	return flagset
@@ -234,6 +233,7 @@ func GetWorkerFlags() *pflag.FlagSet {
 		workerOpts.LogLevels = DefaultLogLevels()
 	}
 
+	flagset.String("kubelet-root-dir", "", "Kubelet root directory for k0s")
 	flagset.StringVar(&workerOpts.WorkerProfile, "profile", "default", "worker profile to use on the node")
 	flagset.StringVar(&workerOpts.CIDRRange, "cidr-range", "10.96.0.0/12", "HACK: cidr range for the windows worker node")
 	flagset.BoolVar(&workerOpts.CloudProvider, "enable-cloud-provider", false, "Whether or not to enable cloud provider support in kubelet")