github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #98980 from syswu/missing_return_nil

Browse Source 
catching errors for 'kubeadm join'
This commit is contained in:
Kubernetes Prow Robot 2021-02-11 21:32:47 -08:00 committed by GitHub
commit b2b8c1f18d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,7 +135,9 @@ func DefaultedJoinConfiguration(defaultversionedcfg *kubeadmapiv1beta2.JoinConfi
// Takes passed flags into account; the defaulting is executed once again enforcing assignment of // Takes passed flags into account; the defaulting is executed once again enforcing assignment of
// static default values to cfg only for values not provided with flags // static default values to cfg only for values not provided with flags
kubeadmscheme.Scheme.Default(defaultversionedcfg) kubeadmscheme.Scheme.Default(defaultversionedcfg)
kubeadmscheme.Scheme.Convert(defaultversionedcfg, internalcfg, nil) if err := kubeadmscheme.Scheme.Convert(defaultversionedcfg, internalcfg, nil); err != nil {
return nil, err
}
// Applies dynamic defaults to settings not provided with flags // Applies dynamic defaults to settings not provided with flags
if err := SetJoinDynamicDefaults(internalcfg); err != nil { if err := SetJoinDynamicDefaults(internalcfg); err != nil {