Merge pull request #462 from hangscer8/add_spray_job_timeout

Add spray job timeout

api/apis/clusteroperation/v1alpha1/types.go

@@ -1,8 +1,8 @@
 package v1alpha1
 
 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"kubean.io/api/apis"
 )
 
@@ -65,6 +65,8 @@ type Spec struct {
 	PostHook []HookAction `json:"postHook"`
 	// +optional
 	Resources corev1.ResourceRequirements `json:"resources"`
+	// +optional
+	ActiveDeadlineSeconds *int64 `json:"activeDeadlineSeconds"`
 }
 
 type HookAction struct {

api/charts/crds/kubean.io_clusteroperations.yaml

@@ -45,6 +45,9 @@ spec:
                 type: string
               actionType:
                 type: string
+              activeDeadlineSeconds:
+                format: int64
+                type: integer
               backoffLimit:
                 type: integer
               cluster:

charts/kubean/Chart.yaml

@@ -1,6 +1,3 @@
-annotations:
-  addon.kpanda.io/namespace: kubean-system
-  addon.kpanda.io/release-name: kubean
 apiVersion: v2
 name: kubean
 description: A Helm chart for kubean

charts/kubean/crds/kubean.io_clusteroperations.yaml

@@ -45,6 +45,9 @@ spec:
                 type: string
               actionType:
                 type: string
+              activeDeadlineSeconds:
+                format: int64
+                type: integer
               backoffLimit:
                 type: integer
               cluster:

pkg/controllers/clusterops/controller.go

@@ -457,6 +457,9 @@ func (c *Controller) NewKubesprayJob(clusterOps *clusteroperationv1alpha1.Cluste
 				},
 			})
 	}
+	if clusterOps.Spec.ActiveDeadlineSeconds != nil && *clusterOps.Spec.ActiveDeadlineSeconds > 0 {
+		job.Spec.ActiveDeadlineSeconds = clusterOps.Spec.ActiveDeadlineSeconds
+	}
 	if !reflect.ValueOf(clusterOps.Spec.Resources).IsZero() {
 		if len(job.Spec.Template.Spec.Containers) > 0 && job.Spec.Template.Spec.Containers[0].Name == "kubespray" {
 			job.Spec.Template.Spec.Containers[0].Resources = clusterOps.Spec.Resources

pkg/controllers/clusterops/controller_test.go

@@ -454,6 +454,25 @@ func TestNewKubesprayJob(t *testing.T) {
 			},
 			want: true,
 		},
+		{
+			name: "activeDeadlineSeconds args",
+			args: func() bool {
+				ActiveDeadlineSeconds := int64(10)
+				clusterOps.Spec.ActiveDeadlineSeconds = &ActiveDeadlineSeconds
+				job := controller.NewKubesprayJob(clusterOps)
+				return *job.Spec.ActiveDeadlineSeconds == 10
+			},
+			want: true,
+		},
+		{
+			name: "nil activeDeadlineSeconds args",
+			args: func() bool {
+				clusterOps.Spec.ActiveDeadlineSeconds = nil
+				job := controller.NewKubesprayJob(clusterOps)
+				return job.Spec.ActiveDeadlineSeconds == nil
+			},
+			want: true,
+		},
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {