From 0bb842637cc2637fad5801e13595d3c4c117f227 Mon Sep 17 00:00:00 2001 From: Heng WU Date: Thu, 11 Feb 2021 09:08:11 +0800 Subject: [PATCH 1/2] Update joinconfiguration.go --- cmd/kubeadm/app/util/config/joinconfiguration.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/kubeadm/app/util/config/joinconfiguration.go b/cmd/kubeadm/app/util/config/joinconfiguration.go index 531e45ebe9c..6d05b1c9ec3 100644 --- a/cmd/kubeadm/app/util/config/joinconfiguration.go +++ b/cmd/kubeadm/app/util/config/joinconfiguration.go @@ -135,7 +135,9 @@ func DefaultedJoinConfiguration(defaultversionedcfg *kubeadmapiv1beta2.JoinConfi // 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 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 if err := SetJoinDynamicDefaults(internalcfg); err != nil { From 4b7f6d875054be8fb6d84065070fee22bde0f768 Mon Sep 17 00:00:00 2001 From: Heng WU Date: Thu, 11 Feb 2021 09:57:08 +0800 Subject: [PATCH 2/2] Update joinconfiguration.go --- cmd/kubeadm/app/util/config/joinconfiguration.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/kubeadm/app/util/config/joinconfiguration.go b/cmd/kubeadm/app/util/config/joinconfiguration.go index 6d05b1c9ec3..89922ef3146 100644 --- a/cmd/kubeadm/app/util/config/joinconfiguration.go +++ b/cmd/kubeadm/app/util/config/joinconfiguration.go @@ -135,7 +135,7 @@ func DefaultedJoinConfiguration(defaultversionedcfg *kubeadmapiv1beta2.JoinConfi // 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 kubeadmscheme.Scheme.Default(defaultversionedcfg) - if err := kubeadmscheme.Scheme.Convert(defaultversionedcfg, internalcfg, nil) ; err != nil { + if err := kubeadmscheme.Scheme.Convert(defaultversionedcfg, internalcfg, nil); err != nil { return nil, err }