Merge pull request #215 from lianghao208/timeduration

Units as part of the field name for the duration field

pkg/apis/internalversion/stage_types.go

@@ -57,19 +57,19 @@ type StageResourceRef struct {
 
 // StageDelay describes the delay time before going to next.
 type StageDelay struct {
-	// Duration indicates the stage delay time.
-	// If JitterDuration is less than Duration, then JitterDuration is used.
-	Duration metav1.Duration
+	// DurationMilliseconds indicates the stage delay time.
+	// If JitterDurationMilliseconds is less than DurationMilliseconds, then JitterDurationMilliseconds is used.
+	DurationMilliseconds *int64
 	// DurationFrom is the expression used to get the value.
-	// If it is a time.Time type, getting the value will be minus time.Now() to get Duration
+	// If it is a time.Time type, getting the value will be minus time.Now() to get DurationMilliseconds
 	// If it is a string type, the value get will be parsed by time.ParseDuration.
 	DurationFrom *ExpressionFromSource
 
-	// JitterDuration is the duration plus an additional amount chosen uniformly
-	// at random from the interval between Duration and JitterDuration.
-	JitterDuration *metav1.Duration
+	// JitterDurationMilliseconds is the duration plus an additional amount chosen uniformly
+	// at random from the interval between DurationMilliseconds and JitterDurationMilliseconds.
+	JitterDurationMilliseconds *int64
 	// JitterDurationFrom is the expression used to get the value.
-	// If it is a time.Time type, getting the value will be minus time.Now() to get JitterDuration
+	// If it is a time.Time type, getting the value will be minus time.Now() to get JitterDurationMilliseconds
 	// If it is a string type, the value get will be parsed by time.ParseDuration.
 	JitterDurationFrom *ExpressionFromSource
 }

pkg/apis/v1alpha1/stage_types.go

@@ -63,19 +63,19 @@ type StageResourceRef struct {
 
 // StageDelay describes the delay time before going to next.
 type StageDelay struct {
-	// Duration indicates the stage delay time.
-	// If JitterDuration is less than Duration, then JitterDuration is used.
-	Duration metav1.Duration `json:"duration"`
+	// DurationMilliseconds indicates the stage delay time.
+	// If JitterDurationMilliseconds is less than DurationMilliseconds, then JitterDurationMilliseconds is used.
+	DurationMilliseconds *int64 `json:"durationMilliseconds,omitempty"`
 	// DurationFrom is the expression used to get the value.
-	// If it is a time.Time type, getting the value will be minus time.Now() to get Duration
+	// If it is a time.Time type, getting the value will be minus time.Now() to get DurationMilliseconds
 	// If it is a string type, the value get will be parsed by time.ParseDuration.
 	DurationFrom *ExpressionFromSource `json:"durationFrom,omitempty"`
 
-	// JitterDuration is the duration plus an additional amount chosen uniformly
-	// at random from the interval between Duration and JitterDuration.
-	JitterDuration *metav1.Duration `json:"jitterDuration,omitempty"`
+	// JitterDurationMilliseconds is the duration plus an additional amount chosen uniformly
+	// at random from the interval between DurationMilliseconds and JitterDurationMilliseconds.
+	JitterDurationMilliseconds *int64 `json:"jitterDurationMilliseconds,omitempty"`
 	// JitterDurationFrom is the expression used to get the value.
-	// If it is a time.Time type, getting the value will be minus time.Now() to get JitterDuration
+	// If it is a time.Time type, getting the value will be minus time.Now() to get JitterDurationMilliseconds
 	// If it is a string type, the value get will be parsed by time.ParseDuration.
 	JitterDurationFrom *ExpressionFromSource `json:"jitterDurationFrom,omitempty"`
 }

pkg/config/config_test.go

@@ -44,6 +44,12 @@ func TestConfig(t *testing.T) {
 				APIVersion: v1alpha1.GroupVersion.String(),
 			},
 		},
+		&internalversion.Stage{
+			TypeMeta: metav1.TypeMeta{
+				Kind:       v1alpha1.StageKind,
+				APIVersion: v1alpha1.GroupVersion.String(),
+			},
+		},
 	}
 	err := Save(ctx, config, data)
 	if err != nil {

pkg/kwok/controllers/lifecycle.go

@@ -30,6 +30,7 @@ import (
 
 	"sigs.k8s.io/kwok/pkg/apis/internalversion"
 	"sigs.k8s.io/kwok/pkg/utils/expression"
+	"sigs.k8s.io/kwok/pkg/utils/format"
 )
 
 func NewStagesFromYaml(data []byte) ([]*internalversion.Stage, error) {
@@ -146,19 +147,24 @@ func newLifecycleFromStage(s *internalversion.Stage) (*LifecycleStage, error) {
 		if delay.DurationFrom != nil {
 			durationFrom = &delay.DurationFrom.ExpressionFrom
 		}
-		duration, err := expression.NewDurationFrom(&delay.Duration.Duration, durationFrom)
+		var delayDuration time.Duration
+		if delay.DurationMilliseconds != nil {
+			delayDuration = time.Duration(*delay.DurationMilliseconds) * time.Millisecond
+		}
+		duration, err := expression.NewDurationFrom(&delayDuration, durationFrom)
 		if err != nil {
 			return nil, err
 		}
 		stage.duration = duration
-		if delay.JitterDuration != nil || delay.JitterDurationFrom != nil {
+
+		if delay.JitterDurationMilliseconds != nil || delay.JitterDurationFrom != nil {
 			var jitterDurationFrom *string
 			if delay.JitterDurationFrom != nil {
 				jitterDurationFrom = &delay.JitterDurationFrom.ExpressionFrom
 			}
 			var jitterDuration *time.Duration
-			if delay.JitterDuration != nil {
-				jitterDuration = &delay.JitterDuration.Duration
+			if delay.JitterDurationMilliseconds != nil {
+				jitterDuration = format.Ptr(time.Duration(*delay.JitterDurationMilliseconds) * time.Millisecond)
 			}
 			jitterDurationGetter, err := expression.NewDurationFrom(jitterDuration, jitterDurationFrom)
 			if err != nil {

site/content/en/docs/user/stages-configuration.md

@@ -33,10 +33,10 @@ spec:
         values:
           - <string>
   delay:
-    duration: <duration-string>
+    durationMilliseconds: <int>
     durationFrom:
       expressionFrom: <expressions-string>
-    jitterDuration: <duration-string>
+    jitterDurationMilliseconds: <int>
     jitterDurationFrom:
       expressionFrom: <expressions-string>
   next:

stages/node-fast.yaml

@@ -110,8 +110,8 @@ spec:
         values:
           - Running
   delay:
-    duration: 20s
-    jitterDuration: 25s
+    durationMilliseconds: 20000
+    jitterDurationMilliseconds: 25000
   next:
     statusTemplate: |
       {{ $now := Now }}

stages/pod-general.yaml

@@ -14,8 +14,8 @@ spec:
         operator: 'DoesNotExist'
   weight: 1
   delay:
-    duration: 1s
-    jitterDuration: 5s
+    durationMilliseconds: 1000
+    jitterDurationMilliseconds: 5000
   next:
     event:
       type: Normal
@@ -122,8 +122,8 @@ spec:
         operator: 'Exists'
   weight: 1
   delay:
-    duration: 1s
-    jitterDuration: 5s
+    durationMilliseconds: 1000
+    jitterDurationMilliseconds: 5000
   next:
     statusTemplate: |
       {{ $now := Now }}
@@ -165,8 +165,8 @@ spec:
         operator: 'Exists'
   weight: 1
   delay:
-    duration: 1s
-    jitterDuration: 5s
+    durationMilliseconds: 1000
+    jitterDurationMilliseconds: 5000
   next:
     statusTemplate: |
       {{ $now := Now }}
@@ -229,8 +229,8 @@ spec:
           - 'True'
   weight: 1
   delay:
-    duration: 1s
-    jitterDuration: 5s
+    durationMilliseconds: 1000
+    jitterDurationMilliseconds: 5000
   next:
     delete: false
     statusTemplate: |
@@ -289,8 +289,8 @@ spec:
           - 'Job'
   weight: 1
   delay:
-    duration: 1s
-    jitterDuration: 5s
+    durationMilliseconds: 1000
+    jitterDurationMilliseconds: 5000
   next:
     delete: false
     statusTemplate: |
@@ -331,8 +331,8 @@ spec:
           - 'kwok.x-k8s.io/fake'
   weight: 1
   delay:
-    duration: 1s
-    jitterDuration: 5s
+    durationMilliseconds: 1000
+    jitterDurationMilliseconds: 5000
   next:
     finalizers:
       remove:
@@ -358,7 +358,7 @@ spec:
         operator: 'DoesNotExist'
   weight: 1
   delay:
-    duration: 1s
+    durationMilliseconds: 1000
     jitterDurationFrom:
       expressionFrom: '.metadata.deletionTimestamp'
   next: