Merge pull request #905 from hangscer8/remove_backofflimit

ErikJiang · web-flow · commit a25d3ada46a8 · 2023-08-01T17:00:03.000+08:00
Remove backofflimit
diff --git a/api/apis/clusteroperation/v1alpha1/types.go b/api/apis/clusteroperation/v1alpha1/types.go
@@ -1,9 +1,9 @@
 package v1alpha1
 
 import (
+	"github.com/kubean-io/kubean-api/apis"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"github.com/kubean-io/kubean-api/apis"
 )
 
 // +genclient
@@ -69,8 +69,6 @@ type Spec struct {
 	// +optional
 	ExtraArgs string `json:"extraArgs"`
 	// +required
-	BackoffLimit int `json:"backoffLimit"`
-	// +required
 	Image string `json:"image"`
 	// +optional
 	PreHook []HookAction `json:"preHook"`
diff --git a/api/charts/crds/kubean.io_clusteroperations.yaml b/api/charts/crds/kubean.io_clusteroperations.yaml
@@ -60,8 +60,6 @@ spec:
               activeDeadlineSeconds:
                 format: int64
                 type: integer
-              backoffLimit:
-                type: integer
               cluster:
                 description: Cluster the name of Cluster.kubean.io.
                 type: string
@@ -221,7 +219,6 @@ spec:
             required:
             - action
             - actionType
-            - backoffLimit
             - cluster
             - image
             type: object
diff --git a/charts/kubean/crds/kubean.io_clusteroperations.yaml b/charts/kubean/crds/kubean.io_clusteroperations.yaml
@@ -60,8 +60,6 @@ spec:
               activeDeadlineSeconds:
                 format: int64
                 type: integer
-              backoffLimit:
-                type: integer
               cluster:
                 description: Cluster the name of Cluster.kubean.io.
                 type: string
@@ -221,7 +219,6 @@ spec:
             required:
             - action
             - actionType
-            - backoffLimit
             - cluster
             - image
             type: object
diff --git a/docs/en/concepts/crds.md b/docs/en/concepts/crds.md
@@ -59,7 +59,6 @@ metadata:
 spec:
   cluster: cluster1-demo
   image: ghcr.m.daocloud.io/kubean-io/spray-job:latest
-  backoffLimit: 0
   actionType: playbook
   action: cluster.yml
   preHook:
@@ -92,7 +91,6 @@ Each field in this CRD is explained as follows:
 - `postHook`: what to do after executing the `action`. Allow multiple values, such as get the cluster status.
   - `actionType`: refer to the above `actionType`.
   - `action`: refer to the above `action`.
-- `backoffLimit`: times of retry if the `action` fails.
 
 ## Manifest
 
diff --git a/docs/en/concepts/custom_action.md b/docs/en/concepts/custom_action.md
@@ -60,7 +60,6 @@ metadata:
 spec:
   cluster: cluster1-demo
   image: ghcr.io/kubean-io/spray-job:latest
-  backoffLimit: 0
   actionType: playbook
   action: myplaybook.yml
   actionSource: configmap
diff --git a/docs/en/usage/airgap.md b/docs/en/usage/airgap.md
@@ -190,7 +190,6 @@ metadata:
 spec:
   cluster: sample
   image: ghcr.io/kubean-io/spray-job:latest
-  backoffLimit: 0
   actionType: playbook
   action: cluster.yml
   preHook:
diff --git a/docs/en/usage/all_in_one_install.md b/docs/en/usage/all_in_one_install.md
@@ -101,7 +101,6 @@ name: cluster-mini-install-ops
 spec:
 cluster: cluster-mini
 image: ghcr.m.daocloud.io/kubean-io/spray-job:v0.5.2 # kubean image version
-backoffLimit: 0
 actionType: playbook
 action: cluster.yml
 preHook:
diff --git a/docs/en/usage/install_without_root.md b/docs/en/usage/install_without_root.md
@@ -135,7 +135,6 @@ data:
     spec:
       cluster: sample
       image: ghcr.m.daocloud.io/kubean-io/spray-job:latest
-      backoffLimit: 0
       actionType: playbook
       action: cluster.yml
       preHook:
diff --git a/docs/en/usage/mirror_install.md b/docs/en/usage/mirror_install.md
@@ -110,7 +110,6 @@ metadata:
 spec:
   cluster: cluster1-online
   image: ghcr.m.daocloud.io/kubean-io/spray-job:v0.5.2 # kubean image version
-  backoffLimit: 0
   actionType: playbook
   action: cluster.yml
   preHook:
diff --git a/docs/en/usage/scale_worknode.md b/docs/en/usage/scale_worknode.md
@@ -190,7 +190,6 @@ metadata:
 spec:
   cluster: cluster-mini
   image: ghcr.m.daocloud.io/kubean-io/spray-job:<TAG> # Please replace <TAG> with the specified version, such as v0.4.9
-  backoffLimit: 0
   actionType: playbook
   action: scale.yml
   extraArgs: --limit=node2
@@ -213,7 +212,6 @@ metadata:
 spec:
   cluster: cluster-mini
   image: ghcr.m.daocloud.io/kubean-io/spray-job:v0.5.2
-  backoffLimit: 0
   actionType: playbook
   action: scale.yml
   extraArgs: --limit=node2
@@ -248,7 +246,6 @@ metadata:
 spec:
   cluster: cluster-mini
   image: ghcr.m.daocloud.io/kubean-io/spray-job:<TAG> # Please replace <TAG> with the specified version, such as v0.4.9
-  backoffLimit: 0
   actionType: playbook
   action: remove-node.yml
   extraArgs: -e node=node2
@@ -269,7 +266,6 @@ metadata:
 spec:
   cluster: cluster-mini
   image: ghcr.m.daocloud.io/kubean-io/spray-job:v0.5.2
-  backoffLimit: 0
   actionType: playbook
   action: remove-node.yml
   extraArgs: -e node=node2
diff --git a/docs/en/usage/sshkey_deploy_cluster.md b/docs/en/usage/sshkey_deploy_cluster.md
@@ -180,7 +180,6 @@ data:
     spec:
       cluster: sample
       image: ghcr.m.daocloud.io/kubean-io/spray-job:latest
-      backoffLimit: 0
       actionType: playbook
       action: cluster.yml
       preHook:
diff --git a/docs/en/usage/uninstall.md b/docs/en/usage/uninstall.md
@@ -30,7 +30,6 @@ metadata:
 spec:
   cluster: cluster-mini
   image: ghcr.m.daocloud.io/kubean-io/spray-job:<TAG> # Please replace <TAG> with the specified version, such as v0.4.9
-  backoffLimit: 0
   actionType: playbook
   action: reset.yml
 ```
diff --git a/docs/en/usage/upgrade.md b/docs/en/usage/upgrade.md
@@ -31,7 +31,6 @@ metadata:
 spec:
   cluster: cluster-mini
   image: ghcr.m.daocloud.io/kubean-io/spray-job:<TAG> # Please replace <TAG> with the specified version, such as v0.4.9
-  backoffLimit: 0
   actionType: playbook
   action: upgrade-cluster.yml
 ```
diff --git a/docs/overrides/test/testcase_details/cluster_operation.md b/docs/overrides/test/testcase_details/cluster_operation.md
@@ -66,10 +66,3 @@
     5. after creation, check the job-related pod status is "Succeeded", and check cluster status by sonobuoy
     6. check k8s version by cmd: kubectl version  --short, the "Server Version" should be: {{X.Y+1.*}}
     7. check node version: kubectl get node -o wide, the version should be {{X.Y+1.*}}
-
-
-### Retry 0 times when job fail
-    1. prepare the config file, and set backoffLimit=0
-    2. start a bound to fail jod
-    3. check the job-related pod status is "Error"
-    4. wait 100s, check the job-related pod total count is 1
diff --git a/docs/zh/concepts/crds.md b/docs/zh/concepts/crds.md
@@ -54,7 +54,6 @@ metadata:
 spec:
   cluster: cluster1-demo
   image: ghcr.m.daocloud.io/kubean-io/spray-job:latest
-  backoffLimit: 0
   actionType: playbook
   action: cluster.yml
   preHook:
@@ -87,7 +86,6 @@ spec:
 - `postHook`：后置执行操作，可以指定多个，例如可以获取集群状态等
   - `actionType`：同上
   - `action`：同上
-- `backoffLimit`：操作执行失败后重试次数
 
 ## Manifest
 
diff --git a/docs/zh/concepts/custom_action.md b/docs/zh/concepts/custom_action.md
@@ -57,7 +57,6 @@ metadata:
 spec:
   cluster: cluster1-demo
   image: ghcr.io/kubean-io/spray-job:latest
-  backoffLimit: 0
   actionType: playbook
   action: myplaybook.yml
   actionSource: configmap
diff --git a/docs/zh/usage/airgap.md b/docs/zh/usage/airgap.md
@@ -240,7 +240,6 @@ metadata:
 spec:
   cluster: sample
   image: ghcr.io/kubean-io/spray-job:latest
-  backoffLimit: 0
   actionType: playbook
   action: cluster.yml
   preHook:
@@ -270,7 +269,6 @@ metadata:
 spec:
   cluster: sample
   image: ghcr.io/kubean-io/spray-job:latest
-  backoffLimit: 0
   actionType: playbook
   action: cluster.yml
   preHook:
diff --git a/docs/zh/usage/all_in_one_install.md b/docs/zh/usage/all_in_one_install.md
@@ -101,7 +101,6 @@ name: cluster-mini-install-ops
 spec:
 cluster: cluster-mini
 image: ghcr.m.daocloud.io/kubean-io/spray-job:v0.5.2 # kubean 镜像版本
-backoffLimit: 0
 actionType: playbook
 action: cluster.yml
 preHook:
diff --git a/docs/zh/usage/install_without_root.md b/docs/zh/usage/install_without_root.md
@@ -129,7 +129,6 @@ data:
     spec:
       cluster: sample
       image: ghcr.m.daocloud.io/kubean-io/spray-job:latest
-      backoffLimit: 0
       actionType: playbook
       action: cluster.yml
       preHook:
diff --git a/docs/zh/usage/mirror_install.md b/docs/zh/usage/mirror_install.md
@@ -108,7 +108,6 @@ metadata:
 spec:
   cluster: cluster1-online
   image: ghcr.m.daocloud.io/kubean-io/spray-job:v0.5.2 # kubean 镜像版本
-  backoffLimit: 0
   actionType: playbook
   action: cluster.yml
   preHook:
diff --git a/docs/zh/usage/scale_worknode.md b/docs/zh/usage/scale_worknode.md
@@ -190,7 +190,6 @@ metadata:
 spec:
   cluster: cluster-mini
   image: ghcr.m.daocloud.io/kubean-io/spray-job:<TAG> # Please replace <TAG> with the specified version, such as v0.4.9
-  backoffLimit: 0
   actionType: playbook
   action: scale.yml
   extraArgs: --limit=node2
@@ -213,7 +212,6 @@ metadata:
 spec:
   cluster: cluster-mini
   image: ghcr.m.daocloud.io/kubean-io/spray-job:v0.5.2
-  backoffLimit: 0
   actionType: playbook
   action: scale.yml
   extraArgs: --limit=node2
@@ -248,7 +246,6 @@ metadata:
 spec:
   cluster: cluster-mini
   image: ghcr.m.daocloud.io/kubean-io/spray-job:<TAG> # Please replace <TAG> with the specified version, such as v0.4.9
-  backoffLimit: 0
   actionType: playbook
   action: remove-node.yml
   extraArgs: -e node=node2
@@ -270,7 +267,6 @@ metadata:
 spec:
   cluster: cluster-mini
   image: ghcr.m.daocloud.io/kubean-io/spray-job:v0.5.2
-  backoffLimit: 0
   actionType: playbook
   action: remove-node.yml
   extraArgs: -e node=node2
diff --git a/docs/zh/usage/sshkey_deploy_cluster.md b/docs/zh/usage/sshkey_deploy_cluster.md
@@ -181,7 +181,6 @@ data:
     spec:
       cluster: sample
       image: ghcr.m.daocloud.io/kubean-io/spray-job:latest
-      backoffLimit: 0
       actionType: playbook
       action: cluster.yml
       preHook:
diff --git a/docs/zh/usage/uninstall.md b/docs/zh/usage/uninstall.md
@@ -29,7 +29,6 @@ metadata:
 spec:
   cluster: cluster-mini
   image: ghcr.m.daocloud.io/kubean-io/spray-job:<TAG> # Please replace <TAG> with the specified version, such as v0.4.9
-  backoffLimit: 0
   actionType: playbook
   action: reset.yml
 ```
diff --git a/docs/zh/usage/upgrade.md b/docs/zh/usage/upgrade.md
@@ -31,7 +31,6 @@ metadata:
 spec:
   cluster: cluster-mini
   image: ghcr.m.daocloud.io/kubean-io/spray-job:<TAG> # Please replace <TAG> with the specified version, such as v0.4.9
-  backoffLimit: 0
   actionType: playbook
   action: upgrade-cluster.yml
 ```
diff --git a/examples/install/1.minimal/AllInOne.yml b/examples/install/1.minimal/AllInOne.yml
@@ -70,7 +70,6 @@ metadata:
 spec:
   cluster: cluster-mini
   image: ghcr.m.daocloud.io/kubean-io/spray-job:<TAG> # Please replace <TAG> with the specified version, such as v0.4.9
-  backoffLimit: 0
   actionType: playbook
   action: cluster.yml
   preHook:
diff --git a/examples/install/2.mirror/ClusterOperation.yml b/examples/install/2.mirror/ClusterOperation.yml
@@ -8,7 +8,6 @@ metadata:
 spec:
   cluster: cluster1-online
   image: ghcr.m.daocloud.io/kubean-io/spray-job:<TAG> # Please replace <TAG> with the specified version, such as v0.4.9
-  backoffLimit: 0
   actionType: playbook
   action: cluster.yml
   preHook:
diff --git a/examples/install/3.airgap/ClusterOperation.yml b/examples/install/3.airgap/ClusterOperation.yml
@@ -8,7 +8,6 @@ metadata:
 spec:
   cluster: cluster2-airgap
   image: ghcr.m.daocloud.io/kubean-io/spray-job:<TAG> # Please replace <TAG> with the specified version, such as v0.4.9
-  backoffLimit: 0
   actionType: playbook
   action: cluster.yml
   preHook:
diff --git a/examples/scale/1.addWorkNode/ClusterOperation.yml b/examples/scale/1.addWorkNode/ClusterOperation.yml
@@ -9,7 +9,6 @@ metadata:
 spec:
   cluster: cluster-mini
   image: ghcr.m.daocloud.io/kubean-io/spray-job:<TAG> # Please replace <TAG> with the specified version, such as v0.4.9
-  backoffLimit: 0
   actionType: playbook
   action: scale.yml
   extraArgs: --limit=node2
diff --git a/examples/scale/2.delWorkNode/ClusterOperation.yml b/examples/scale/2.delWorkNode/ClusterOperation.yml
@@ -9,7 +9,6 @@ metadata:
 spec:
   cluster: cluster-mini
   image: ghcr.m.daocloud.io/kubean-io/spray-job:<TAG> # Please replace <TAG> with the specified version, such as v0.4.9
-  backoffLimit: 0
   actionType: playbook
   action: remove-node.yml
   extraArgs: -e node=node2
diff --git a/examples/uninstall/ClusterOperation.yml b/examples/uninstall/ClusterOperation.yml
@@ -9,6 +9,5 @@ metadata:
 spec:
   cluster: cluster-mini
   image: ghcr.m.daocloud.io/kubean-io/spray-job:<TAG> # Please replace <TAG> with the specified version, such as v0.4.9
-  backoffLimit: 0
   actionType: playbook
   action: reset.yml
diff --git a/examples/upgrade/ClusterOperation.yml b/examples/upgrade/ClusterOperation.yml
@@ -9,6 +9,5 @@ metadata:
 spec:
   cluster: cluster-mini
   image: ghcr.m.daocloud.io/kubean-io/spray-job:<TAG> # Please replace <TAG> with the specified version, such as v0.4.9
-  backoffLimit: 0
   actionType: playbook
   action: upgrade-cluster.yml
diff --git a/go.mod b/go.mod
@@ -3,6 +3,7 @@ module github.com/kubean-io/kubean
 go 1.20
 
 require (
+	github.com/go-logr/logr v1.2.4
 	github.com/kubean-io/kubean-api v0.0.0
 	github.com/onsi/ginkgo/v2 v2.9.4
 	github.com/onsi/gomega v1.27.6
@@ -33,7 +34,6 @@ require (
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.20.0 // indirect
diff --git a/pkg/controllers/clusterops/controller.go b/pkg/controllers/clusterops/controller.go
@@ -8,7 +8,6 @@ import (
 	"crypto/md5"
 	"fmt"
 	"reflect"
-	"strconv"
 	"strings"
 	"time"
 	"unicode"
@@ -68,7 +67,6 @@ func (c *Controller) CalSalt(clusterOps *clusteroperationv1alpha1.ClusterOperati
 	summaryStr += clusterOps.Spec.Cluster
 	summaryStr += string(clusterOps.Spec.ActionType)
 	summaryStr += strings.TrimSpace(clusterOps.Spec.Action)
-	summaryStr += strconv.Itoa(clusterOps.Spec.BackoffLimit)
 	summaryStr += clusterOps.Spec.Image
 	for _, action := range clusterOps.Spec.PreHook {
 		summaryStr += string(action.ActionType)
@@ -381,7 +379,7 @@ func (c *Controller) FetchGlobalManifestImageTag() string {
 }
 
 func (c *Controller) NewKubesprayJob(clusterOps *clusteroperationv1alpha1.ClusterOperation, serviceAccountName string) *batchv1.Job {
-	BackoffLimit := int32(clusterOps.Spec.BackoffLimit)
+	BackoffLimit := int32(0)
 	DefaultMode := int32(0o700)
 	PrivatekeyMode := int32(0o400)
 	jobName := c.GenerateJobName(clusterOps)
diff --git a/pkg/controllers/clusterops/controller_test.go b/pkg/controllers/clusterops/controller_test.go
diff --git a/test/common/kubeanClusterOps.yml b/test/common/kubeanClusterOps.yml
diff --git a/test/kubeanOps_functions_nightlye2e/backofflimit-clusterops/kubeanClusterOps.yml b/test/kubeanOps_functions_nightlye2e/backofflimit-clusterops/kubeanClusterOps.yml
diff --git a/test/kubeanOps_functions_nightlye2e/e2e-install-cluster/kubeanClusterOps.yml b/test/kubeanOps_functions_nightlye2e/e2e-install-cluster/kubeanClusterOps.yml
diff --git a/test/kubean_functions_e2e/e2e-install-cluster/kubeanClusterOps.yml b/test/kubean_functions_e2e/e2e-install-cluster/kubeanClusterOps.yml
diff --git a/test/kubean_reset_e2e/e2e-reset-cluster/kubeanClusterOps.yml b/test/kubean_reset_e2e/e2e-reset-cluster/kubeanClusterOps.yml
diff --git a/test/offline-common/kubeanClusterOps.yml b/test/offline-common/kubeanClusterOps.yml
diff --git a/vendor/github.com/kubean-io/kubean-api/apis/clusteroperation/v1alpha1/types.go b/vendor/github.com/kubean-io/kubean-api/apis/clusteroperation/v1alpha1/types.go
diff --git a/vendor/github.com/kubean-io/kubean-api/apis/manifest/v1alpha1/types.go b/vendor/github.com/kubean-io/kubean-api/apis/manifest/v1alpha1/types.go
diff --git a/vendor/github.com/kubean-io/kubean-api/apis/manifest/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/kubean-io/kubean-api/apis/manifest/v1alpha1/zz_generated.deepcopy.go
