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

Merge pull request #107314 from neolit123/1.24-fix-panic-in-runkubeletconfig

Browse Source 
kubeadm: fix panic in runKubeletConfigPhase
This commit is contained in:
Kubernetes Prow Robot 2022-01-04 23:03:35 -08:00 committed by GitHub
commit 885961cda8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/phases/upgrade/node/kubeletconfig.go
View File

@ -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:
// https://github.com/kubernetes/kubeadm/issues/2426
var nro *kubeadmapi.NodeRegistrationOptions
var missingURLScheme bool
nro := &kubeadmapi.NodeRegistrationOptions{}
if !dryRun {
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")