refactor: use a single preKubeadmCommand

nutanix-cloud-native · Jun 11, 2024 · 395a503 · 395a503
1 parent 103b263
commit 395a503
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 21 deletions.
diff --git a/pkg/handlers/generic/mutation/controlplanevirtualip/inject_test.go b/pkg/handlers/generic/mutation/controlplanevirtualip/inject_test.go
@@ -82,8 +82,7 @@ var _ = Describe("Generate ControlPlane virtual IP patches", func() {
 						Operation: "add",
 						Path:      "/spec/template/spec/kubeadmConfigSpec/preKubeadmCommands",
 						ValueMatcher: gomega.ContainElements(
-							"/bin/bash /etc/caren/configure-for-kube-vip.sh set-host-aliases",
-							"/bin/bash /etc/caren/configure-for-kube-vip.sh use-super-admin.conf",
+							"/bin/bash /etc/caren/configure-for-kube-vip.sh set-host-aliases use-super-admin.conf",
 						),
 					},
 					{
@@ -162,8 +161,7 @@ var _ = Describe("Generate ControlPlane virtual IP patches", func() {
 						Operation: "add",
 						Path:      "/spec/template/spec/kubeadmConfigSpec/preKubeadmCommands",
 						ValueMatcher: gomega.ContainElements(
-							"/bin/bash /etc/caren/configure-for-kube-vip.sh set-host-aliases",
-							"/bin/bash /etc/caren/configure-for-kube-vip.sh use-super-admin.conf",
+							"/bin/bash /etc/caren/configure-for-kube-vip.sh set-host-aliases use-super-admin.conf",
 						),
 					},
 					{

diff --git a/pkg/handlers/generic/mutation/controlplanevirtualip/providers/kubevip.go b/pkg/handlers/generic/mutation/controlplanevirtualip/providers/kubevip.go
@@ -31,11 +31,9 @@ var (
 		"configure-for-kube-vip.sh")
 
 	configureForKubeVIPScriptOnRemotePreKubeadmCommand = "/bin/bash " +
-		configureForKubeVIPScriptOnRemote + " use-super-admin.conf"
+		configureForKubeVIPScriptOnRemote + " set-host-aliases use-super-admin.conf"
 	configureForKubeVIPScriptOnRemotePostKubeadmCommand = "/bin/bash " +
 		configureForKubeVIPScriptOnRemote + " use-admin.conf"
-
-	setHostAliasesScriptOnRemoteCommand = "/bin/bash " + configureForKubeVIPScriptOnRemote + " set-host-aliases"
 )
 
 //go:embed templates/configure-for-kube-vip.sh
@@ -132,10 +130,7 @@ func (p *kubeVIPFromConfigMapProvider) GenerateFilesAndCommands(
 		},
 	)
 
-	preKubeadmCommands = []string{
-		setHostAliasesScriptOnRemoteCommand,
-		configureForKubeVIPScriptOnRemotePreKubeadmCommand,
-	}
+	preKubeadmCommands = []string{configureForKubeVIPScriptOnRemotePreKubeadmCommand}
 	postKubeadmCommands = []string{configureForKubeVIPScriptOnRemotePostKubeadmCommand}
 
 	return files, preKubeadmCommands, postKubeadmCommands, nil

diff --git a/pkg/handlers/generic/mutation/controlplanevirtualip/providers/kubevip_test.go b/pkg/handlers/generic/mutation/controlplanevirtualip/providers/kubevip_test.go
@@ -68,7 +68,7 @@ func Test_GenerateFilesAndCommands(t *testing.T) {
 				},
 			},
 			expectedPreKubeadmCommands: []string{
-				setHostAliasesScriptOnRemoteCommand, configureForKubeVIPScriptOnRemotePreKubeadmCommand,
+				configureForKubeVIPScriptOnRemotePreKubeadmCommand,
 			},
 			expectedPostKubeadmCommands: []string{
 				configureForKubeVIPScriptOnRemotePostKubeadmCommand,

diff --git a/...lers/generic/mutation/controlplanevirtualip/providers/templates/configure-for-kube-vip.sh b/...lers/generic/mutation/controlplanevirtualip/providers/templates/configure-for-kube-vip.sh
@@ -28,27 +28,21 @@ function set_host_aliases() {
 
 function print_usage {
   cat >&2 <<EOF
-  Usage: ${SCRIPT_NAME} [use-super-admin.conf|use-admin.conf|set-host-aliases]
+Usage: ${SCRIPT_NAME} [set-host-aliases|use-super-admin.conf|use-admin.conf]
 EOF
 }
 
 function run_cmd() {
-  while [ -n "$1" ]; do
+  while [ $# -gt 0 ]; do
     case $1 in
     use-super-admin.conf)
       use_super_admin_conf
-      shift
-      break
       ;;
     use-admin.conf)
       use_admin_conf
-      shift
-      break
       ;;
     set-host-aliases)
       set_host_aliases
-      shift
-      break
       ;;
     -h | --help)
       print_usage
@@ -59,7 +53,6 @@ function run_cmd() {
       exit 1
       ;;
     esac
-    echo "$1"
     shift
   done
 }