github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 22:20:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #72367 from rojkov/fix-golint-warnings

Browse Source 
kubeadm: fix golint warnings for redundant ifs
This commit is contained in:
Kubernetes Prow Robot
2018-12-28 12:03:15 -08:00
committed by GitHub
parent b89ab2c0c3 0bf0b3ef1a
commit 7d8554643e
7 changed files with 7 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/kubeadm/app/util/config/initconfiguration.go
View File

@@ -54,10 +54,7 @@ func SetInitDynamicDefaults(cfg *kubeadmapi.InitConfiguration) error {
if err := SetAPIEndpointDynamicDefaults(&cfg.LocalAPIEndpoint); err != nil {
return err
}
if err := SetClusterDynamicDefaults(&cfg.ClusterConfiguration, cfg.LocalAPIEndpoint.AdvertiseAddress, cfg.LocalAPIEndpoint.BindPort); err != nil {
return err
}
return nil
return SetClusterDynamicDefaults(&cfg.ClusterConfiguration, cfg.LocalAPIEndpoint.AdvertiseAddress, cfg.LocalAPIEndpoint.BindPort)
}
// SetBootstrapTokensDynamicDefaults checks and sets configuration values for the BootstrapTokens object

6
cmd/kubeadm/app/util/config/joinconfiguration.go
View File

@@ -41,11 +41,7 @@ func SetJoinDynamicDefaults(cfg *kubeadmapi.JoinConfiguration) error {
return err
}
if err := SetJoinControlPlaneDefaults(cfg.ControlPlane); err != nil {
return err
}
return nil
return SetJoinControlPlaneDefaults(cfg.ControlPlane)
}
// SetJoinControlPlaneDefaults checks and sets configuration values for the JoinControlPlane object