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

kubeadm: feature gate ControlPlaneKubeletLocalMode on upgrade

Browse Source
This commit is contained in:
Christian Schlotter 2024-06-28 13:31:26 +02:00
parent 241c1c7737
commit e51b55b451
No known key found for this signature in database
GPG Key ID: 0E487122453EB0AC
2 changed files with 65 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/kubeadm/app/cmd/phases/upgrade/node/controlplane.go
View File

@ -24,6 +24,7 @@ import (
"k8s.io/kubernetes/cmd/kubeadm/app/cmd/options"
"k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow"
"k8s.io/kubernetes/cmd/kubeadm/app/features"
"k8s.io/kubernetes/cmd/kubeadm/app/phases/upgrade"
"k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient"
)
@ -82,6 +83,12 @@ func runControlPlane() func(c workflow.RunData) error {
return errors.Wrap(err, "failed to perform addons upgrade")
}
if features.Enabled(cfg.FeatureGates, features.ControlPlaneKubeletLocalMode) {
if err := upgrade.UpdateKubeletLocalMode(cfg, dryRun); err != nil {
return errors.Wrap(err, "failed to update kubelet local mode")
}
}
fmt.Println("[upgrade] The control plane instance for this node was successfully updated!")
return nil

58
cmd/kubeadm/app/phases/upgrade/postupgrade.go
View File

@ -31,10 +31,12 @@ import (
errorsutil "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/apimachinery/pkg/util/sets"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/klog/v2"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
"k8s.io/kubernetes/cmd/kubeadm/app/features"
"k8s.io/kubernetes/cmd/kubeadm/app/phases/addons/dns"
"k8s.io/kubernetes/cmd/kubeadm/app/phases/addons/proxy"
"k8s.io/kubernetes/cmd/kubeadm/app/phases/bootstraptoken/clusterinfo"
@ -109,6 +111,12 @@ func PerformPostUpgradeTasks(client clientset.Interface, cfg *kubeadmapi.InitCon
errs = append(errs, err)
}
if features.Enabled(cfg.FeatureGates, features.ControlPlaneKubeletLocalMode) {
if err := UpdateKubeletLocalMode(cfg, dryRun); err != nil {
return errors.Wrap(err, "failed to update kubelet local mode")
}
}
return errorsutil.NewAggregate(errs)
}
@ -281,3 +289,53 @@ func GetKubeletDir(dryRun bool) (string, error) {
}
return kubeadmconstants.KubeletRunDirectory, nil
}
func UpdateKubeletLocalMode(cfg *kubeadmapi.InitConfiguration, dryRun bool) error {
// TODO(chrischdi): how to get the correct dir? kubeadm init has a flag to change the location
dir := kubeadmconstants.KubernetesDir
kubeletKubeConfigFilePath := filepath.Join(dir, kubeadmconstants.KubeletKubeConfigFileName)
if _, err := os.Stat(kubeletKubeConfigFilePath); err != nil {
if os.IsNotExist(err) {
// TODO(chrischdi): should we print a warning or even return the error?
return nil
}
return err
}
config, err := clientcmd.LoadFromFile(kubeletKubeConfigFilePath)
if err != nil {
return err
}
configContext, ok := config.Contexts[config.CurrentContext]
if !ok {
return errors.Errorf("cannot find cluster for active context in kubeconfig %q", kubeletKubeConfigFilePath)
}
localAPIEndpoint, err := kubeadmutil.GetLocalAPIEndpoint(&cfg.LocalAPIEndpoint)
if err != nil {
return err
}
// Skip changing kubeconfig file if LocalAPIEndpoint is already set.
if config.Clusters[configContext.Cluster].Server == localAPIEndpoint {
return nil
}
if dryRun {
fmt.Printf("[dryrun] Would change the server url from %q to %q in %s and try to restart kubelet\n", localAPIEndpoint, config.Clusters[configContext.Cluster].Server, kubeletKubeConfigFilePath)
return nil
}
config.Clusters[configContext.Cluster].Server = localAPIEndpoint
if err := clientcmd.WriteToFile(*config, kubeletKubeConfigFilePath); err != nil {
return err
}
kubeletphase.TryRestartKubelet()
return nil
}