Allow specifying human-readable duration string for drain timeout

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

Author: brandond

doc/plan.md

@@ -63,7 +63,7 @@ _Appears in:_
 
 | Field | Description | Default | Validation |
 | --- | --- | --- | --- |
-| `timeout` _[Duration](#duration)_ |  |  |  |
+| `timeout` _[IntOrString](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#intorstring-intstr-util)_ | If a string, this is passed through directly to the `kubectl drain` command.<br />If an int, this represents the duration as a count of nanoseconds, and will be converted to a duration string when passed to the `kubectl drain` command. |  |  |
 | `gracePeriod` _integer_ |  |  |  |
 | `deleteLocalData` _boolean_ |  |  |  |
 | `deleteEmptydirData` _boolean_ |  |  |  |

pkg/apis/upgrade.cattle.io/v1/types.go

@@ -11,6 +11,7 @@ import (
 	"github.com/rancher/wrangler/v3/pkg/genericcondition"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
 var (
@@ -137,7 +138,9 @@ type VolumeSpec struct {
 // - https://kubernetes.io/docs/tasks/administer-cluster/safely-drain-node/
 // - https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#drain
 type DrainSpec struct {
-	Timeout                  *time.Duration        `json:"timeout,omitempty"`
+	// If a string, this is passed through directly to the `kubectl drain` command.
+	// If an int, this represents the duration as a count of nanoseconds, and will be converted to a duration string when passed to the `kubectl drain` command.
+	Timeout                  *intstr.IntOrString   `json:"timeout,omitempty"`
 	GracePeriod              *int32                `json:"gracePeriod,omitempty"`
 	DeleteLocalData          *bool                 `json:"deleteLocalData,omitempty"`
 	DeleteEmptydirData       *bool                 `json:"deleteEmptydirData,omitempty"`

pkg/apis/upgrade.cattle.io/v1/zz_generated_deepcopy.go

@@ -145,12 +145,13 @@ spec:
                   skipWaitForDeleteTimeout:
                     type: integer
                   timeout:
+                    anyOf:
+                    - type: integer
+                    - type: string
                     description: |-
-                      A Duration represents the elapsed time between two instants
-                      as an int64 nanosecond count. The representation limits the
-                      largest representable duration to approximately 290 years.
-                    format: int64
-                    type: integer
+                      If a string, this is passed through directly to the `kubectl drain` command.
+                      If an int, this represents the duration as a count of nanoseconds, and will be converted to a duration string when passed to the `kubectl drain` command.
+                    x-kubernetes-int-or-string: true
                 type: object
               exclusive:
                 description: Jobs for exclusive plans cannot be run alongside any

pkg/crds/yaml/generated/upgrade.cattle.io_plans.yaml

@@ -19,6 +19,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/selection"
+	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/utils/pointer"
 )
 
@@ -354,7 +355,13 @@ func New(plan *upgradeapiv1.Plan, node *corev1.Node, controllerName string) *bat
 			args = append(args, "--force")
 		}
 		if drain.Timeout != nil {
-			args = append(args, "--timeout", drain.Timeout.String())
+			switch drain.Timeout.Type {
+			case intstr.Int:
+				timeout := time.Duration(drain.Timeout.IntVal)
+				args = append(args, "--timeout", timeout.String())
+			case intstr.String:
+				args = append(args, "--timeout", drain.Timeout.StrVal)
+			}
 		}
 		if drain.GracePeriod != nil {
 			args = append(args, "--grace-period", strconv.FormatInt(int64(*drain.GracePeriod), 10))
@@ -448,8 +455,17 @@ func New(plan *upgradeapiv1.Plan, node *corev1.Node, controllerName string) *bat
 		}
 	}
 
-	if drain != nil && drain.Timeout != nil && job.Spec.ActiveDeadlineSeconds != nil && drain.Timeout.Milliseconds() > *job.Spec.ActiveDeadlineSeconds*1000 {
-		logrus.Warnf("Plan %s/%s drain timeout exceeds active deadline seconds", plan.Namespace, plan.Name)
+	if drain != nil && drain.Timeout != nil && job.Spec.ActiveDeadlineSeconds != nil {
+		var timeout time.Duration
+		switch drain.Timeout.Type {
+		case intstr.Int:
+			timeout = time.Duration(drain.Timeout.IntVal)
+		case intstr.String:
+			timeout, _ = time.ParseDuration(drain.Timeout.StrVal)
+		}
+		if timeout.Milliseconds() > *job.Spec.ActiveDeadlineSeconds*1000 {
+			logrus.Warnf("Plan %s/%s drain timeout exceeds active deadline seconds", plan.Namespace, plan.Name)
+		}
 	}
 
 	return job