mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 20:53:33 +00:00
Update joinconfiguration.go
This commit is contained in:
parent
0bb842637c
commit
4b7f6d8750
@ -135,7 +135,7 @@ 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)
|
||||||
if err := kubeadmscheme.Scheme.Convert(defaultversionedcfg, internalcfg, nil) ; err != nil {
|
if err := kubeadmscheme.Scheme.Convert(defaultversionedcfg, internalcfg, nil); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user