mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-15 06:01:50 +00:00
Revert "Kubelet flags take precedence over config from files/ConfigMaps"
This reverts commit cbebb61450
.
This commit is contained in:
@@ -53,7 +53,7 @@ func main() {
|
||||
}
|
||||
options.AddKubeletConfigFlags(pflag.CommandLine, defaultConfig)
|
||||
|
||||
// initialize pflag and parse the initial command line flags into the respective objects
|
||||
// parse the command line flags into the respective objects
|
||||
flag.InitFlags()
|
||||
|
||||
// initialize logging and defer flush
|
||||
@@ -80,12 +80,6 @@ func main() {
|
||||
die(err)
|
||||
}
|
||||
|
||||
// re-parse the command-line flags on top of the returned configuration
|
||||
// we layer flags over file-based and remote configuration to
|
||||
// preserve backwards compatibility across binary upgrades
|
||||
// see issue #56171 for more details
|
||||
pflag.Parse()
|
||||
|
||||
// construct a KubeletServer from kubeletFlags and kubeletConfig
|
||||
kubeletServer := &options.KubeletServer{
|
||||
KubeletFlags: *kubeletFlags,
|
||||
|
Reference in New Issue
Block a user