Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove --config from kubeadm upgrade #5391

Closed
wants to merge 2 commits into from
Closed

fix: remove --config from kubeadm upgrade #5391

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cee57f
fix: remove --config from kubeadm upgrade
ghostloda Feb 20, 2025
6f9788d
fix: miss version
ghostloda Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 5 additions & 17 deletions pkg/runtime/kubernetes/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import (
"context"
"fmt"
"path"
"strings"
"time"

Expand All @@ -33,7 +32,7 @@
)

const (
upgradeApplyCmd = "kubeadm upgrade apply --certificate-renewal=false --config %s --yes"
upgradeApplyCmd = "kubeadm upgrade apply --certificate-renewal=false --ignore-preflight-errors=all --yes %s"
upradeNodeCmd = "kubeadm upgrade node --certificate-renewal=false --skip-phases preflight"
//drainNodeCmd = "kubectl drain %s --ignore-daemonsets"
cordonNodeCmd = "kubectl cordon %s"
Expand All @@ -45,20 +44,20 @@
installKubeletCmd = "cp -rf %s/kubelet /usr/bin"
installKubectlCmd = "cp -rf %s/kubectl /usr/bin"

writeKubeadmConfig = `cat > %s << EOF

Check failure on line 47 in pkg/runtime/kubernetes/upgrade.go

View workflow job for this annotation

GitHub Actions / golangci-lint (.) 

const `writeKubeadmConfig` is unused (unused)
%s
EOF`
)

func (k *KubeadmRuntime) upgradeCluster(version string) error {
logger.Info("Change ClusterConfiguration up to newVersion if need.")
conversion, err := k.autoUpdateConfig(version)
_, err := k.autoUpdateConfig(version)
if err != nil {
return err
}
//upgrade master0
logger.Info("start to upgrade master0")
err = k.upgradeMaster0(conversion, version)
err = k.upgradeMaster0(version)
if err != nil {
return err
}
Expand All @@ -74,7 +73,7 @@
return k.upgradeOtherNodes(upgradeNodes, version)
}

func (k *KubeadmRuntime) upgradeMaster0(conversion *types.ConvertedKubeadmConfig, version string) error {
func (k *KubeadmRuntime) upgradeMaster0(version string) error {
master0ip := k.getMaster0IP()
sver := semver.MustParse(version)
if gte(sver, V1260) {
Expand Down Expand Up @@ -107,22 +106,11 @@
logger.Warn("image pull pre-upgrade failed: %s", err.Error())
}

config, err := yaml.MarshalConfigs(&conversion.InitConfiguration, &conversion.ClusterConfiguration)
if err != nil {
logger.Error("kubeadm config marshal failed: %s", err.Error())
return err
}

upgradeConfigName := "kubeadm-upgrade.yaml"
upgradeConfigPath := path.Join(k.pathResolver.EtcPath(), upgradeConfigName)

err = k.sshCmdAsync(master0ip,
//install kubeadm:{version} at master0
fmt.Sprintf(installKubeadmCmd, kubeBinaryPath),
// write kubeadm config to file
fmt.Sprintf(writeKubeadmConfig, upgradeConfigPath, string(config)),
//execute kubeadm upgrade apply {version} at master0
fmt.Sprintf(upgradeApplyCmd, upgradeConfigPath),
fmt.Sprintf(upgradeApplyCmd, version),
//kubectl cordon <node-to-cordon>
fmt.Sprintf(cordonNodeCmd, master0Name),
//install kubelet:{version},kubectl{version} at master0
Expand Down
Loading