Revert "Kubelet flags take precedence over config from files/ConfigMaps"

This reverts commit cbebb61450.
This commit is contained in:
Jordan Liggitt
2017-11-21 23:55:43 -05:00
parent 1489d19443
commit ae7dccf2e9
12 changed files with 18 additions and 335 deletions

View File

@@ -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,