Skip to content

K
k3s
Commit 87970bc3 authored by Clayton Coleman's avatar Clayton Coleman
Browse files
Options

Use the new client.SetKubernetesDefaults methods to properly default config object

parent 80260f4c
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 9 deletions
pkg/kubectl/cmd/cmd.go
View file @ 87970bc3
...@@ -325,17 +325,9 @@ func (c *clientCache) ClientConfigForVersion(version string) (*client.Config, er ...@@ -325,17 +325,9 @@ func (c *clientCache) ClientConfigForVersion(version string) (*client.Config, er
} }
} }
// TODO: remove when SetKubernetesDefaults gets added
if len(version) == 0 {
version = c.defaultConfig.Version
}
// TODO: have a better config copy method // TODO: have a better config copy method
config := *c.defaultConfig config := *c.defaultConfig
client.SetKubernetesDefaults(&config)
// TODO: call new client.SetKubernetesDefaults method
// instead of doing this
config.Version = version
return &config, nil return &config, nil
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment