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

Merge pull request #129429 from neolit123/automated-cherry-pick-of-#129418-origin-release-1.32-1735554474

Browse Source 
Automated cherry pick of #129418 kubeadm: skip disabled addons in clusterconfig on upgrade
This commit is contained in:
Kubernetes Prow Robot 2025-01-09 17:38:31 -08:00 committed by GitHub
commit 08ec9118a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/kubeadm/app/cmd/phases/upgrade/addons.go
View File

@ -83,13 +83,20 @@ func getInitData(c workflow.RunData) (*kubeadmapi.InitConfiguration, clientset.I
// runCoreDNSAddon upgrades the CoreDNS addon.
func runCoreDNSAddon(c workflow.RunData) error {
const skipMessagePrefix = "[upgrade/addon] Skipping the addon/coredns phase."
cfg, client, patchesDir, out, dryRun, isControlPlaneNode, err := getInitData(c)
if err != nil {
return err
}
if !isControlPlaneNode {
fmt.Println("[upgrade/addon] Skipping addon/coredns phase. Not a control plane node.")
fmt.Fprintf(out, "%s Not a control plane node.\n", skipMessagePrefix)
return nil
}
if cfg.ClusterConfiguration.DNS.Disabled {
fmt.Fprintf(out, "%s The addon is disabled.\n", skipMessagePrefix)
return nil
}
@ -110,13 +117,20 @@ func runCoreDNSAddon(c workflow.RunData) error {
// runKubeProxyAddon upgrades the kube-proxy addon.
func runKubeProxyAddon(c workflow.RunData) error {
const skipMessagePrefix = "[upgrade/addon] Skipping the addon/kube-proxy phase."
cfg, client, _, out, dryRun, isControlPlaneNode, err := getInitData(c)
if err != nil {
return err
}
if !isControlPlaneNode {
fmt.Println("[upgrade/addon] Skipping addon/kube-proxy phase. Not a control plane node.")
fmt.Fprintf(out, "%s Not a control plane node.\n", skipMessagePrefix)
return nil
}
if cfg.ClusterConfiguration.Proxy.Disabled {
fmt.Fprintf(out, "%s The addon is disabled.\n", skipMessagePrefix)
return nil
}