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

Merge pull request #129956 from chrischdi/pr-kubeadm-cp-local-mode-fixes

Browse Source 
kubeadm: Promote ControlPlaneKubeletLocalMode feature gate to beta - second attempt
This commit is contained in:
Kubernetes Prow Robot 2025-02-05 07:02:16 -08:00 committed by GitHub
commit d2ad0cc7c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 77 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/cmd/join.go
View File

@ -609,7 +609,9 @@ func (j *joinData) Client() (clientset.Interface, error) {
AppendReactor(dryRun.GetKubeadmConfigReactor()).
AppendReactor(dryRun.GetKubeadmCertsReactor()).
AppendReactor(dryRun.GetKubeProxyConfigReactor()).
AppendReactor(dryRun.GetKubeletConfigReactor())
AppendReactor(dryRun.GetKubeletConfigReactor()).
AppendReactor(dryRun.GetNodeReactor()).
AppendReactor(dryRun.PatchNodeReactor())
j.client = dryRun.FakeClient()
return j.client, nil

13
cmd/kubeadm/app/cmd/phases/join/kubelet.go
View File

@ -293,6 +293,16 @@ func runKubeletWaitBootstrapPhase(c workflow.RunData) (returnErr error) {
return err
}
var client clientset.Interface
if data.DryRun() {
fmt.Println("[kubelet-wait] Would wait for the kubelet to be bootstrapped")
// Use the dry-run client.
if client, err = data.Client(); err != nil {
return errors.Wrap(err, "could not get client for dry-run")
}
} else {
bootstrapKubeConfigFile := filepath.Join(data.KubeConfigDir(), kubeadmconstants.KubeletBootstrapKubeConfigFileName)
// Deletes the bootstrapKubeConfigFile, so the credential used for TLS bootstrap is removed from disk
defer func() {
@ -328,10 +338,11 @@ func runKubeletWaitBootstrapPhase(c workflow.RunData) (returnErr error) {
}
// When we know the /etc/kubernetes/kubelet.conf file is available, get the client
client, err := kubeconfigutil.ClientSetFromFile(kubeadmconstants.GetKubeletKubeConfigPath())
client, err = kubeconfigutil.ClientSetFromFile(kubeadmconstants.GetKubeletKubeConfigPath())
if err != nil {
return err
}
}
if !features.Enabled(initCfg.ClusterConfiguration.FeatureGates, features.NodeLocalCRISocket) {
klog.V(1).Infoln("[kubelet-start] preserving the crisocket information for the node")

7
cmd/kubeadm/app/cmd/phases/upgrade/apply/kubeconfig.go
View File

@ -24,7 +24,6 @@ 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"
)
@ -53,13 +52,11 @@ func runKubeconfig() func(c workflow.RunData) error {
cfg := data.InitCfg()
if features.Enabled(cfg.FeatureGates, features.ControlPlaneKubeletLocalMode) {
if err := upgrade.UpdateKubeletLocalMode(cfg, data.DryRun()); err != nil {
if err := upgrade.UpdateKubeletKubeconfigServer(cfg, data.DryRun()); err != nil {
return errors.Wrap(err, "failed to update kubelet local mode")
}
}
fmt.Println("[upgrad/kubeconfig] The kubeconfig files for this node were successfully upgraded!")
fmt.Println("[upgrade/kubeconfig] The kubeconfig files for this node were successfully upgraded!")
return nil
}

5
cmd/kubeadm/app/cmd/phases/upgrade/node/kubeconfig.go
View File

@ -24,7 +24,6 @@ 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"
)
@ -60,11 +59,9 @@ func runKubeconfig() func(c workflow.RunData) error {
// Otherwise, retrieve all the info required for kubeconfig upgrade.
cfg := data.InitCfg()
if features.Enabled(cfg.FeatureGates, features.ControlPlaneKubeletLocalMode) {
if err := upgrade.UpdateKubeletLocalMode(cfg, data.DryRun()); err != nil {
if err := upgrade.UpdateKubeletKubeconfigServer(cfg, data.DryRun()); err != nil {
return errors.Wrap(err, "failed to update kubelet local mode")
}
}
fmt.Println("[upgrade/kubeconfig] The kubeconfig files for this node were successfully upgraded!")

4
cmd/kubeadm/app/features/features.go
View File

@ -36,7 +36,7 @@ const (
RootlessControlPlane = "RootlessControlPlane"
// WaitForAllControlPlaneComponents is expected to be alpha in v1.30
WaitForAllControlPlaneComponents = "WaitForAllControlPlaneComponents"
// ControlPlaneKubeletLocalMode is expected to be in alpha in v1.31, beta in v1.32
// ControlPlaneKubeletLocalMode is expected to be in alpha in v1.31, beta in v1.33
ControlPlaneKubeletLocalMode = "ControlPlaneKubeletLocalMode"
// NodeLocalCRISocket is expected to be in alpha in v1.32, beta in v1.33, ga in v1.35
NodeLocalCRISocket = "NodeLocalCRISocket"
@ -54,7 +54,7 @@ var InitFeatureGates = FeatureList{
" Once UserNamespacesSupport graduates to GA, kubeadm will start using it and RootlessControlPlane will be removed.",
},
WaitForAllControlPlaneComponents: {FeatureSpec: featuregate.FeatureSpec{Default: true, PreRelease: featuregate.Beta}},
ControlPlaneKubeletLocalMode: {FeatureSpec: featuregate.FeatureSpec{Default: false, PreRelease: featuregate.Alpha}},
ControlPlaneKubeletLocalMode: {FeatureSpec: featuregate.FeatureSpec{Default: true, PreRelease: featuregate.Beta}},
NodeLocalCRISocket: {FeatureSpec: featuregate.FeatureSpec{Default: false, PreRelease: featuregate.Alpha}},
}

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

@ -193,11 +193,11 @@ func WriteKubeletConfigFiles(cfg *kubeadmapi.InitConfiguration, kubeletConfigDir
return nil
}
// UpdateKubeletLocalMode changes the Server URL in the kubelets kubeconfig to the local API endpoint if it is currently
// set to the ControlPlaneEndpoint.
// TODO: remove this function once kubeletKubeConfigFilePath goes GA and is hardcoded to enabled by default:
// UpdateKubeletKubeconfigServer changes the Server URL in the kubelets kubeconfig if necessary depending on the
// ControlPlaneKubeletLocalMode feature gate.
// TODO: remove this function once ControlPlaneKubeletLocalMode goes GA and is hardcoded to be enabled by default:
// https://github.com/kubernetes/kubeadm/issues/2271
func UpdateKubeletLocalMode(cfg *kubeadmapi.InitConfiguration, dryRun bool) error {
func UpdateKubeletKubeconfigServer(cfg *kubeadmapi.InitConfiguration, dryRun bool) error {
kubeletKubeConfigFilePath := filepath.Join(kubeadmconstants.KubernetesDir, kubeadmconstants.KubeletKubeConfigFileName)
if _, err := os.Stat(kubeletKubeConfigFilePath); err != nil {
@ -228,19 +228,30 @@ func UpdateKubeletLocalMode(cfg *kubeadmapi.InitConfiguration, dryRun bool) erro
return err
}
var targetServer string
if features.Enabled(cfg.FeatureGates, features.ControlPlaneKubeletLocalMode) {
// Skip changing kubeconfig file if Server does not match the ControlPlaneEndpoint.
if config.Clusters[configContext.Cluster].Server != controlPlaneAPIEndpoint || controlPlaneAPIEndpoint == localAPIEndpoint {
klog.V(2).Infof("Skipping update of the Server URL in %s, because it's already not equal to %q or already matches the localAPIEndpoint", kubeletKubeConfigFilePath, cfg.ControlPlaneEndpoint)
klog.V(2).Infof("Skipping update of the Server URL in %s, because it's already not equal to %q or already matches the localAPIEndpoint", kubeletKubeConfigFilePath, controlPlaneAPIEndpoint)
return nil
}
targetServer = localAPIEndpoint
} else {
// Skip changing kubeconfig file if Server does not match the localAPIEndpoint.
if config.Clusters[configContext.Cluster].Server != localAPIEndpoint {
klog.V(2).Infof("Skipping update of the Server URL in %s, because it already matches the controlPlaneAPIEndpoint", kubeletKubeConfigFilePath)
return nil
}
targetServer = controlPlaneAPIEndpoint
}
if dryRun {
fmt.Printf("[dryrun] Would change the Server URL from %q to %q in %s and try to restart kubelet\n", config.Clusters[configContext.Cluster].Server, localAPIEndpoint, kubeletKubeConfigFilePath)
fmt.Printf("[dryrun] Would change the Server URL from %q to %q in %s and try to restart kubelet\n", config.Clusters[configContext.Cluster].Server, targetServer, kubeletKubeConfigFilePath)
return nil
}
klog.V(1).Infof("Changing the Server URL from %q to %q in %s", config.Clusters[configContext.Cluster].Server, localAPIEndpoint, kubeletKubeConfigFilePath)
config.Clusters[configContext.Cluster].Server = localAPIEndpoint
klog.V(1).Infof("Changing the Server URL from %q to %q in %s", config.Clusters[configContext.Cluster].Server, targetServer, kubeletKubeConfigFilePath)
config.Clusters[configContext.Cluster].Server = targetServer
if err := clientcmd.WriteToFile(*config, kubeletKubeConfigFilePath); err != nil {
return err