mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-26 05:03:09 +00:00
Merge pull request #107314 from neolit123/1.24-fix-panic-in-runkubeletconfig
kubeadm: fix panic in runKubeletConfigPhase
This commit is contained in:
commit
885961cda8
@ -102,8 +102,8 @@ func runKubeletConfigPhase() func(c workflow.RunData) error {
|
|||||||
//
|
//
|
||||||
// TODO: this workaround can be removed in 1.25 once all user node sockets have a URL scheme:
|
// TODO: this workaround can be removed in 1.25 once all user node sockets have a URL scheme:
|
||||||
// https://github.com/kubernetes/kubeadm/issues/2426
|
// https://github.com/kubernetes/kubeadm/issues/2426
|
||||||
var nro *kubeadmapi.NodeRegistrationOptions
|
|
||||||
var missingURLScheme bool
|
var missingURLScheme bool
|
||||||
|
nro := &kubeadmapi.NodeRegistrationOptions{}
|
||||||
if !dryRun {
|
if !dryRun {
|
||||||
if err := configutil.GetNodeRegistration(data.KubeConfigPath(), data.Client(), nro); err != nil {
|
if err := configutil.GetNodeRegistration(data.KubeConfigPath(), data.Client(), nro); err != nil {
|
||||||
return errors.Wrap(err, "could not retrieve the node registration options for this node")
|
return errors.Wrap(err, "could not retrieve the node registration options for this node")
|
||||||
|
Loading…
Reference in New Issue
Block a user