优化 kubectl 相关命令

pkg/cmd/kubectl.go

@@ -1,34 +1,13 @@
 package cmd
 
-import (
-	"log"
-	"time"
-)
-
 const KubectlPatchRetries = 3
 
 func RunKubectlVersion(kubeconfig string) error {
-	return Run("kubectl", "--kubeconfig", kubeconfig, "version")
+	return RunRetries(KubectlPatchRetries, "kubectl", "--kubeconfig", kubeconfig,
+		"version")
 }
 
-func RunKubectlPatch(kubeconfig, namespace, workload, workloadType, patch string) (err error) {
-	i := 0
-	for {
-		if err = Run("kubectl",
-			"--kubeconfig", kubeconfig,
-			"--namespace", namespace,
-			"patch", workloadType+"s/"+workload,
-			"-p", patch,
-		); err == nil {
-			return
-		}
-
-		i++
-		if i > KubectlPatchRetries {
-			return
-		}
-
-		log.Printf("部署失败，5s 后重试")
-		time.Sleep(time.Second * 5)
-	}
+func RunKubectlPatch(kubeconfig, namespace, workload, workloadType, patch string) error {
+	return RunRetries(KubectlPatchRetries, "kubectl", "--kubeconfig", kubeconfig,
+		"--namespace", namespace, "patch", workloadType+"s/"+workload, "-p", patch)
 }

pkg/cmd/run.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"os/exec"
 	"strings"
+	"time"
 )
 
 func Run(name string, args ...string) (err error) {
@@ -18,3 +19,21 @@ func Run(name string, args ...string) (err error) {
 	}
 	return
 }
+
+func RunRetries(retry int, name string, args ...string) (err error) {
+	if retry < 1 {
+		retry = 1
+	}
+	for {
+		if err = Run(name, args...); err == nil {
+			return
+		}
+
+		retry--
+		if retry == 0 {
+			return
+		}
+		time.Sleep(time.Second * 5)
+		log.Printf("5s 后重试, 剩余 %d", retry)
+	}
+}