add grace period for pod kill chaos (chaos-mesh#663)

Signed-off-by: Gong Mengnan <[email protected]>

api/v1alpha1/podchaos_types.go

@@ -188,6 +188,12 @@ type PodChaosSpec struct {
 	// Needed in container-kill.
 	// +optional
 	ContainerName string `json:"containerName"`
+
+	// GracePeriod is used in pod-kill action. It represents the duration in seconds before the pod should be deleted.
+	// Value must be non-negative integer. The default value is zero that indicates delete immediately.
+	// +optional
+	// +kubebuilder:validation:Minimum=0
+	GracePeriod int64 `json:"gracePeriod"`
 }
 
 func (in *PodChaosSpec) GetSelector() SelectorSpec {

config/crd/bases/pingcap.com_podchaos.yaml

@@ -53,6 +53,14 @@ spec:
                 fraction and a unit suffix, such as "300ms", "-1.5h" or "2h45m". Valid
                 time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
               type: string
+            gracePeriod:
+              description: GracePeriod is used in pod-kill action. It represents the
+                duration in seconds before the pod should be deleted. Value must be
+                non-negative integer. The default value is zero that indicates delete
+                immediately.
+              format: int64
+              minimum: 0
+              type: integer
             mode:
               description: 'Mode defines the mode to run chaos action. Supported mode:
                 one / all / fixed / fixed-percent / random-max-percent'

controllers/podchaos/podkill/types.go

@@ -74,7 +74,7 @@ func (r *Reconciler) Apply(ctx context.Context, req ctrl.Request, chaos v1alpha1
 			r.Log.Info("Deleting", "namespace", pod.Namespace, "name", pod.Name)
 
 			if err := r.Delete(ctx, pod, &client.DeleteOptions{
-				GracePeriodSeconds: new(int64), // PeriodSeconds has to be set specifically
+				GracePeriodSeconds: &podchaos.Spec.GracePeriod, // PeriodSeconds has to be set specifically
 			}); err != nil {
 				r.Log.Error(err, "unable to delete pod")
 				return err

manifests/crd.yaml

@@ -1016,6 +1016,14 @@ spec:
                 fraction and a unit suffix, such as "300ms", "-1.5h" or "2h45m". Valid
                 time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
               type: string
+            gracePeriod:
+              description: GracePeriod is used in pod-kill action. It represents the
+                duration in seconds before the pod should be deleted. Value must be
+                non-negative integer. The default value is zero that indicates delete
+                immediately.
+              format: int64
+              minimum: 0
+              type: integer
             mode:
               description: 'Mode defines the mode to run chaos action. Supported mode:
                 one / all / fixed / fixed-percent / random-max-percent'