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

Merge pull request #114608 from neolit123/1.27-fix-dry-run-kubelet-backup-bug

Browse Source 
kubeadm: revert feature to backup kubelet config for "upgrade node"
This commit is contained in:
Kubernetes Prow Robot 2022-12-20 09:00:06 -08:00 committed by GitHub
commit d84e4baf9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,21 +71,6 @@ func runKubeletConfigPhase() func(c workflow.RunData) error {
return err
}
// Create a copy of the kubelet config file in the /etc/kubernetes/tmp/ folder.
backupDir, err := constants.CreateTempDirForKubeadm(constants.KubernetesDir, "kubeadm-kubelet-config")
if err != nil {
return err
}
src := filepath.Join(kubeletDir, constants.KubeletConfigurationFileName)
dest := filepath.Join(backupDir, constants.KubeletConfigurationFileName)
if !dryRun {
fmt.Printf("[upgrade] Backing up kubelet config file to %s\n", dest)
if err := os.Rename(src, dest); err != nil {
return errors.Wrap(err, "error backing up the kubelet config file")
}
} else {
fmt.Printf("[dryrun] Would back up kubelet config file to %s\n", dest)
}
// Store the kubelet component configuration.
if err = kubeletphase.WriteConfigToDisk(&cfg.ClusterConfiguration, kubeletDir, data.PatchesDir(), data.OutputWriter()); err != nil {
return err