test: implement nodeclaim.spec.terminationGracePeriod CEL tests

Signed-off-by: wmgroot <wmgroot@gmail.com>

kwok/charts/crds/karpenter.sh_nodeclaims.yaml

@@ -267,6 +267,7 @@ spec:
 
                     The feature can also be used to allow maximum time limits for long-running jobs which can delay node termination with preStop hooks.
                     If left undefined, the controller will wait indefinitely for pods to be drained.
+                  pattern: ^([0-9]+(\\.[0-9]+)?(s|m|h))+$
                   type: string
               required:
                 - nodeClassRef
@@ -731,6 +732,7 @@ spec:
 
                     The feature can also be used to allow maximum time limits for long-running jobs which can delay node termination with preStop hooks.
                     If left undefined, the controller will wait indefinitely for pods to be drained.
+                  pattern: ^([0-9]+(\\.[0-9]+)?(s|m|h))+$
                   type: string
               required:
                 - nodeClassRef

kwok/charts/crds/karpenter.sh_nodepools.yaml

@@ -407,6 +407,7 @@ spec:
 
                             The feature can also be used to allow maximum time limits for long-running jobs which can delay node termination with preStop hooks.
                             If left undefined, the controller will wait indefinitely for pods to be drained.
+                          pattern: ^([0-9]+(\\.[0-9]+)?(s|m|h))+$
                           type: string
                       required:
                         - nodeClassRef
@@ -1009,6 +1010,7 @@ spec:
 
                             The feature can also be used to allow maximum time limits for long-running jobs which can delay node termination with preStop hooks.
                             If left undefined, the controller will wait indefinitely for pods to be drained.
+                          pattern: ^([0-9]+(\\.[0-9]+)?(s|m|h))+$
                           type: string
                       required:
                         - nodeClassRef

pkg/apis/crds/karpenter.sh_nodeclaims.yaml

@@ -265,6 +265,7 @@ spec:
 
                     The feature can also be used to allow maximum time limits for long-running jobs which can delay node termination with preStop hooks.
                     If left undefined, the controller will wait indefinitely for pods to be drained.
+                  pattern: ^([0-9]+(\\.[0-9]+)?(s|m|h))+$
                   type: string
               required:
                 - nodeClassRef
@@ -727,6 +728,7 @@ spec:
 
                     The feature can also be used to allow maximum time limits for long-running jobs which can delay node termination with preStop hooks.
                     If left undefined, the controller will wait indefinitely for pods to be drained.
+                  pattern: ^([0-9]+(\\.[0-9]+)?(s|m|h))+$
                   type: string
               required:
                 - nodeClassRef

pkg/apis/crds/karpenter.sh_nodepools.yaml

@@ -405,6 +405,7 @@ spec:
 
                             The feature can also be used to allow maximum time limits for long-running jobs which can delay node termination with preStop hooks.
                             If left undefined, the controller will wait indefinitely for pods to be drained.
+                          pattern: ^([0-9]+(\\.[0-9]+)?(s|m|h))+$
                           type: string
                       required:
                         - nodeClassRef
@@ -1005,6 +1006,7 @@ spec:
 
                             The feature can also be used to allow maximum time limits for long-running jobs which can delay node termination with preStop hooks.
                             If left undefined, the controller will wait indefinitely for pods to be drained.
+                          pattern: ^([0-9]+(\\.[0-9]+)?(s|m|h))+$
                           type: string
                       required:
                         - nodeClassRef

pkg/apis/v1/nodeclaim.go

@@ -59,6 +59,8 @@ type NodeClaimSpec struct {
 	//
 	// The feature can also be used to allow maximum time limits for long-running jobs which can delay node termination with preStop hooks.
 	// If left undefined, the controller will wait indefinitely for pods to be drained.
+	// +kubebuilder:validation:Pattern=`^([0-9]+(\\.[0-9]+)?(s|m|h))+$`
+	// +kubebuilder:validation:Type="string"
 	// +optional
 	TerminationGracePeriod *metav1.Duration `json:"terminationGracePeriod,omitempty"`
 }

pkg/apis/v1/nodeclaim_validation_cel_test.go

@@ -19,6 +19,7 @@ package v1_test
 import (
 	"strconv"
 	"strings"
+	"time"
 
 	"sigs.k8s.io/karpenter/pkg/test"
 
@@ -223,4 +224,14 @@ var _ = Describe("Validation", func() {
 			Expect(env.Client.Create(ctx, nodeClaim)).ToNot(Succeed())
 		})
 	})
+	Context("TerminationGracePeriod", func() {
+		It("should succeed on a positive terminationGracePeriod duration", func() {
+			nodeClaim.Spec.TerminationGracePeriod = &metav1.Duration{Duration: time.Second * 300}
+			Expect(env.Client.Create(ctx, nodeClaim)).To(Succeed())
+		})
+		It("should fail on a negative terminationGracePeriod duration", func() {
+			nodeClaim.Spec.TerminationGracePeriod = &metav1.Duration{Duration: time.Second * -30}
+			Expect(env.Client.Create(ctx, nodeClaim)).ToNot(Succeed())
+		})
+	})
 })

pkg/apis/v1/nodepool_validation_cel_test.go

@@ -604,4 +604,14 @@ var _ = Describe("CEL/Validation", func() {
 			}
 		})
 	})
+	Context("TerminationGracePeriod", func() {
+		It("should succeed on a positive terminationGracePeriod duration", func() {
+			nodePool.Spec.Template.Spec.TerminationGracePeriod = &metav1.Duration{Duration: time.Second * 300}
+			Expect(env.Client.Create(ctx, nodePool)).To(Succeed())
+		})
+		It("should fail on a negative terminationGracePeriod duration", func() {
+			nodePool.Spec.Template.Spec.TerminationGracePeriod = &metav1.Duration{Duration: time.Second * -30}
+			Expect(env.Client.Create(ctx, nodePool)).ToNot(Succeed())
+		})
+	})
 })

pkg/apis/v1beta1/nodeclaim.go

@@ -66,6 +66,8 @@ type NodeClaimSpec struct {
 	//
 	// The feature can also be used to allow maximum time limits for long-running jobs which can delay node termination with preStop hooks.
 	// If left undefined, the controller will wait indefinitely for pods to be drained.
+	// +kubebuilder:validation:Pattern=`^([0-9]+(\\.[0-9]+)?(s|m|h))+$`
+	// +kubebuilder:validation:Type="string"
 	// +optional
 	TerminationGracePeriod *metav1.Duration `json:"terminationGracePeriod,omitempty"`
 }

pkg/apis/v1beta1/nodeclaim_validation_cel_test.go

@@ -428,4 +428,14 @@ var _ = Describe("Validation", func() {
 			})
 		})
 	})
+	Context("TerminationGracePeriod", func() {
+		It("should succeed on a positive terminationGracePeriod duration", func() {
+			nodeClaim.Spec.TerminationGracePeriod = &metav1.Duration{Duration: time.Second * 300}
+			Expect(env.Client.Create(ctx, nodeClaim)).To(Succeed())
+		})
+		It("should fail on a negative terminationGracePeriod duration", func() {
+			nodeClaim.Spec.TerminationGracePeriod = &metav1.Duration{Duration: time.Second * -30}
+			Expect(env.Client.Create(ctx, nodeClaim)).ToNot(Succeed())
+		})
+	})
 })

pkg/apis/v1beta1/nodepool_validation_cel_test.go

@@ -878,4 +878,14 @@ var _ = Describe("CEL/Validation", func() {
 			Expect(env.Client.Create(ctx, nodePool)).ToNot(Succeed())
 		})
 	})
+	Context("TerminationGracePeriod", func() {
+		It("should succeed on a positive terminationGracePeriod duration", func() {
+			nodePool.Spec.Template.Spec.TerminationGracePeriod = &metav1.Duration{Duration: time.Second * 300}
+			Expect(env.Client.Create(ctx, nodePool)).To(Succeed())
+		})
+		It("should fail on a negative terminationGracePeriod duration", func() {
+			nodePool.Spec.Template.Spec.TerminationGracePeriod = &metav1.Duration{Duration: time.Second * -30}
+			Expect(env.Client.Create(ctx, nodePool)).ToNot(Succeed())
+		})
+	})
 })