Skip to content

Commit

Permalink
address minor nits
Browse files Browse the repository at this point in the history 
Signed-off-by: Rahul Ganesh <rahulgab@amazon.com>
  • Loading branch information
Rahul Ganesh committed Apr 9, 2024
1 parent 453bbd7 commit cbe4b3e
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 21 deletions.
2 changes: 1 addition & 1 deletion projects/aws/upgrader/cmd/upgradekubeletkubectl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
var upgradeKubeletKubectlCmd = &cobra.Command{
Use: "kubelet-kubectl",
Short: "Upgrade kubelet-kubectl",
Long: "Use upgrade kubelet-kubectl to upgrade kubelet and kubectl on the node",
Long: "Use upgrade kubelet-kubectl command to upgrade kubelet and kubectl on the node",
RunE: func(cmd *cobra.Command, args []string) error {
err := upgradeKubeletAndKubectl(cmd.Context())
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion projects/aws/upgrader/cmd/upgradenode.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
var upgradeNodeCmd = &cobra.Command{
Use: "node",
Short: "Upgrade node",
Long: "Use upgrade node to upgrade kubeadm on the node",
Long: "Use upgrade node command to upgrade kubeadm on the node",
RunE: func(cmd *cobra.Command, args []string) error {
var err error

Expand Down
1 change: 1 addition & 0 deletions projects/aws/upgrader/upgrade/cniplugins.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"github.com/aws/eks-anywhere-build-tooling/tools/version-tracker/pkg/util/logger"
)

// CNIPluginsUpgrade upgrades cni plugins on the node
func (u *InPlaceUpgrader) CNIPluginsUpgrade(ctx context.Context) error {
cmpDir, err := u.upgradeComponentsBinDir()
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions projects/aws/upgrader/upgrade/kubeadm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func (u *InPlaceUpgrader) KubeAdmInFirstCP(ctx context.Context) error {
if err = u.BackUpAndReplace(kubeAdmBinDir, componentsDir, fmt.Sprintf("%s/kubeadm", componentsDir)); err != nil {
return fmt.Errorf("backing up and replacing kubeadm binary: %v", err)
}
logger.Info("backed up and replaced kubeadm binary sucessfully")
logger.Info("backed up and replaced kubeadm binary successfully")

kubeAdmConfigBackUp := fmt.Sprintf("%s/kubeadm-config.backup.yaml", componentsDir)
newKubeAdmConfig := fmt.Sprintf("%s/kubeadm-config.yaml", componentsDir)
Expand Down Expand Up @@ -124,7 +124,7 @@ func (u *InPlaceUpgrader) KubeAdmInRestCP(ctx context.Context) error {
if err = u.BackUpAndReplace(kubeAdmBinDir, componentsDir, fmt.Sprintf("%s/kubeadm", componentsDir)); err != nil {
return fmt.Errorf("backing up and replacing kubeadm binary: %v", err)
}
logger.Info("Backed up and replaced kubeadm binary sucessfully")
logger.Info("Backed up and replaced kubeadm binary successfully")

if err = u.backUpAndDeleteCoreDNSConfig(ctx, componentsDir); err != nil {
return fmt.Errorf("backing up and deleting coreDNS config: %v", err)
Expand Down Expand Up @@ -180,7 +180,7 @@ func (u *InPlaceUpgrader) KubeAdmInWorker(ctx context.Context) error {
if err = u.BackUpAndReplace(kubeAdmBinDir, componentsDir, fmt.Sprintf("%s/kubeadm", componentsDir)); err != nil {
return fmt.Errorf("backing up and replacing kubeadm binary: %v", err)
}
logger.Info("Backed up and replaced kubeadm binary sucessfully")
logger.Info("Backed up and replaced kubeadm binary successfully")

kubeAdmVersionCmd := []string{"kubeadm", "version"}
version, err := u.ExecCommand(ctx, kubeAdmVersionCmd[0], kubeAdmVersionCmd[1:]...)
Expand Down
6 changes: 3 additions & 3 deletions projects/aws/upgrader/upgrade/kubelet_kubectl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ const (
func (u *InPlaceUpgrader) KubeletKubectlUpgrade(ctx context.Context) error {
cmpDir, err := u.upgradeComponentsKubernetesBinDir()
if err != nil {
return fmt.Errorf("getting upgrade componenets binary directory: %v", err)
return fmt.Errorf("getting upgrade components binary directory: %v", err)
}

if err := u.BackUpAndReplace(kubectlBinPath, cmpDir, fmt.Sprintf("%s/kubectl", cmpDir)); err != nil {
return fmt.Errorf("backing up and replacing kubectl binary: %v", err)
}
logger.Info("Backed up and replaced kubectl sucessfully")
logger.Info("Backed up and replaced kubectl successfully")

stopKubeletCmd := []string{"systemctl", "stop", "kubelet"}
out, err := u.ExecCommand(ctx, stopKubeletCmd[0], stopKubeletCmd[1:]...)
Expand All @@ -46,7 +46,7 @@ func (u *InPlaceUpgrader) KubeletKubectlUpgrade(ctx context.Context) error {
if err := u.BackUpAndReplace(kubeletBinPath, cmpDir, fmt.Sprintf("%s/kubelet", cmpDir)); err != nil {
return fmt.Errorf("backing up and replacing kubelet binary: %v", err)
}
logger.Info("Backed up and replaced kubelet sucessfully")
logger.Info("Backed up and replaced kubelet successfully")

kubeAdmVersionCmd := []string{"kubeadm", "version", "-oshort"}
kubeVersion, err := u.ExecCommand(ctx, kubeAdmVersionCmd[0], kubeAdmVersionCmd[1:]...)
Expand Down
20 changes: 10 additions & 10 deletions projects/aws/upgrader/upgrade/kubelet_kubectl_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ func TestKubeletKubectlUpgradeStopKubeletCmdError(t *testing.T) {
tt.s.EXPECT().Executable().Return("/foo/eks-upgrades/tools", nil).Times(1)
tt.s.EXPECT().Stat(fmt.Sprintf("%s/%s.bk", upgCompBinDir, "kubectl")).Return(nil, errors.New("")).Times(1)
tt.s.EXPECT().ReadFile(kubectlBinPath).Return([]byte{}, nil).Times(1)
tt.s.EXPECT().WriteFile(kubectlBkFile, []byte{}, fs.FileMode(0o640)).Return(nil).Times(1)
tt.s.EXPECT().WriteFile(kubectlBkFile, []byte{}, fileMode416).Return(nil).Times(1)
tt.s.EXPECT().ReadFile(fmt.Sprintf("%s/%s", upgCompBinDir, "kubectl")).Return([]byte{}, nil).Times(1)
tt.s.EXPECT().WriteFile(kubectlBinPath, []byte{}, fs.FileMode(0o640)).Return(nil).Times(1)
tt.s.EXPECT().WriteFile(kubectlBinPath, []byte{}, fileMode416).Return(nil).Times(1)
tt.s.EXPECT().ExecCommand(ctx, "systemctl", "stop", "kubelet").Return(nil, errors.New("")).Times(1)

err := tt.u.KubeletKubectlUpgrade(ctx)
Expand All @@ -165,9 +165,9 @@ func TestKubeletKubectlUpgradeKubeletBackupError(t *testing.T) {
tt.s.EXPECT().Executable().Return("/foo/eks-upgrades/tools", nil).Times(1)
tt.s.EXPECT().Stat(fmt.Sprintf("%s/%s.bk", upgCompBinDir, "kubectl")).Return(nil, errors.New("")).Times(1)
tt.s.EXPECT().ReadFile(kubectlBinPath).Return([]byte{}, nil).Times(1)
tt.s.EXPECT().WriteFile(kubectlBkFile, []byte{}, fs.FileMode(0o640)).Return(nil).Times(1)
tt.s.EXPECT().WriteFile(kubectlBkFile, []byte{}, fileMode416).Return(nil).Times(1)
tt.s.EXPECT().ReadFile(fmt.Sprintf("%s/%s", upgCompBinDir, "kubectl")).Return([]byte{}, nil).Times(1)
tt.s.EXPECT().WriteFile(kubectlBinPath, []byte{}, fs.FileMode(0o640)).Return(nil).Times(1)
tt.s.EXPECT().WriteFile(kubectlBinPath, []byte{}, fileMode416).Return(nil).Times(1)
tt.s.EXPECT().ExecCommand(ctx, "systemctl", "stop", "kubelet").Return(nil, nil).Times(1)
tt.s.EXPECT().Stat(fmt.Sprintf("%s/%s.bk", upgCompBinDir, "kubelet")).Return(nil, errors.New("")).Times(1)
tt.s.EXPECT().ReadFile(kubeletBinPath).Return(nil, errors.New("")).Times(1)
Expand All @@ -184,9 +184,9 @@ func TestKubeletKubectlUpgradeKubeadmVersionError(t *testing.T) {
tt.s.EXPECT().Executable().Return("/foo/eks-upgrades/tools", nil).Times(1)
tt.s.EXPECT().Stat(fmt.Sprintf("%s/%s.bk", upgCompBinDir, "kubectl")).Return(nil, errors.New("")).Times(1)
tt.s.EXPECT().ReadFile(kubectlBinPath).Return([]byte{}, nil).Times(1)
tt.s.EXPECT().WriteFile(kubectlBkFile, []byte{}, fs.FileMode(0o640)).Return(nil).Times(1)
tt.s.EXPECT().WriteFile(kubectlBkFile, []byte{}, fileMode416).Return(nil).Times(1)
tt.s.EXPECT().ReadFile(fmt.Sprintf("%s/%s", upgCompBinDir, "kubectl")).Return([]byte{}, nil).Times(1)
tt.s.EXPECT().WriteFile(kubectlBinPath, []byte{}, fs.FileMode(0o640)).Return(nil).Times(1)
tt.s.EXPECT().WriteFile(kubectlBinPath, []byte{}, fileMode416).Return(nil).Times(1)
tt.s.EXPECT().ExecCommand(ctx, "systemctl", "stop", "kubelet").Return(nil, nil).Times(1)
tt.s.EXPECT().Stat(fmt.Sprintf("%s/%s.bk", upgCompBinDir, "kubelet")).Return(nil, nil).Times(1)
tt.s.EXPECT().ExecCommand(ctx, "kubeadm", "version", "-oshort").Return([]byte("v1.26.x"), errors.New(""))
Expand All @@ -203,9 +203,9 @@ func TestKubeletKubectlUpgradeDaemonReloadError(t *testing.T) {
tt.s.EXPECT().Executable().Return("/foo/eks-upgrades/tools", nil).Times(1)
tt.s.EXPECT().Stat(fmt.Sprintf("%s/%s.bk", upgCompBinDir, "kubectl")).Return(nil, errors.New("")).Times(1)
tt.s.EXPECT().ReadFile(kubectlBinPath).Return([]byte{}, nil).Times(1)
tt.s.EXPECT().WriteFile(kubectlBkFile, []byte{}, fs.FileMode(0o640)).Return(nil).Times(1)
tt.s.EXPECT().WriteFile(kubectlBkFile, []byte{}, fileMode416).Return(nil).Times(1)
tt.s.EXPECT().ReadFile(fmt.Sprintf("%s/%s", upgCompBinDir, "kubectl")).Return([]byte{}, nil).Times(1)
tt.s.EXPECT().WriteFile(kubectlBinPath, []byte{}, fs.FileMode(0o640)).Return(nil).Times(1)
tt.s.EXPECT().WriteFile(kubectlBinPath, []byte{}, fileMode416).Return(nil).Times(1)
tt.s.EXPECT().ExecCommand(ctx, "systemctl", "stop", "kubelet").Return(nil, nil).Times(1)
tt.s.EXPECT().Stat(fmt.Sprintf("%s/%s.bk", upgCompBinDir, "kubelet")).Return(nil, nil).Times(1)
tt.s.EXPECT().ExecCommand(ctx, "kubeadm", "version", "-oshort").Return([]byte("v1.25.x"), nil)
Expand All @@ -222,9 +222,9 @@ func TestKubeletKubectlUpgradeKubeletRestartError(t *testing.T) {
tt.s.EXPECT().Executable().Return("/foo/eks-upgrades/tools", nil).Times(1)
tt.s.EXPECT().Stat(fmt.Sprintf("%s/%s.bk", upgCompBinDir, "kubectl")).Return(nil, errors.New("")).Times(1)
tt.s.EXPECT().ReadFile(kubectlBinPath).Return([]byte{}, nil).Times(1)
tt.s.EXPECT().WriteFile(kubectlBkFile, []byte{}, fs.FileMode(0o640)).Return(nil).Times(1)
tt.s.EXPECT().WriteFile(kubectlBkFile, []byte{}, fileMode416).Return(nil).Times(1)
tt.s.EXPECT().ReadFile(fmt.Sprintf("%s/%s", upgCompBinDir, "kubectl")).Return([]byte{}, nil).Times(1)
tt.s.EXPECT().WriteFile(kubectlBinPath, []byte{}, fs.FileMode(0o640)).Return(nil).Times(1)
tt.s.EXPECT().WriteFile(kubectlBinPath, []byte{}, fileMode416).Return(nil).Times(1)
tt.s.EXPECT().ExecCommand(ctx, "systemctl", "stop", "kubelet").Return(nil, nil).Times(1)
tt.s.EXPECT().Stat(fmt.Sprintf("%s/%s.bk", upgCompBinDir, "kubelet")).Return(nil, nil).Times(1)
tt.s.EXPECT().ExecCommand(ctx, "kubeadm", "version", "-oshort").Return([]byte("v1.25.x"), nil)
Expand Down
2 changes: 1 addition & 1 deletion projects/aws/upgrader/upgrade/status.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func (u *InPlaceUpgrader) LogStatusAndCleanup(ctx context.Context) error {

upgCmpDir, err := u.upgradeComponentsDir()
if err != nil {
return fmt.Errorf("getting upgrade componenets kubernetes binary directory: %v", err)
return fmt.Errorf("getting upgrade components kubernetes binary directory: %v", err)
}

cleanUpCmd := []string{"rm", "-rf", upgCmpDir}
Expand Down
1 change: 1 addition & 0 deletions projects/aws/upgrader/upgrade/syscalls.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"os/exec"
)

// SysCalls serves different os level calls on a node.
type SysCalls struct {
WriteFile func(string, []byte, os.FileMode) error
ReadFile func(string) ([]byte, error)
Expand Down
4 changes: 2 additions & 2 deletions projects/aws/upgrader/upgrade/upgrader_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ func TestBackUpAndReplace(t *testing.T) {
tt.s.EXPECT().ReadFile(oldFile).Return(nil, errors.New(tc.returnErr))
} else {
tt.s.EXPECT().ReadFile(oldFile).Return([]byte{}, nil)
tt.s.EXPECT().WriteFile(fmt.Sprintf("%s/%s", backUpFolder, newFile), []byte{}, fs.FileMode(0o640)).Return(nil)
tt.s.EXPECT().WriteFile(fmt.Sprintf("%s/%s", backUpFolder, newFile), []byte{}, fileMode416).Return(nil)
tt.s.EXPECT().ReadFile(newFile).Return([]byte{}, nil)
tt.s.EXPECT().WriteFile(oldFile, []byte{}, fs.FileMode(0o640)).Return(nil)
tt.s.EXPECT().WriteFile(oldFile, []byte{}, fileMode416).Return(nil)
}
err := tt.u.BackUpAndReplace(oldFile, backUpFolder, newFile)
if tc.ifErr {
Expand Down

0 comments on commit cbe4b3e

Please sign in to comment.