fix cases

Signed-off-by: Megrez Lu <[email protected]>
openkruise · May 14, 2024 · d0fad8d · d0fad8d
1 parent 9985a2f
commit d0fad8d
Show file tree

Hide file tree

Showing 6 changed files with 143 additions and 62 deletions.
diff --git a/test/e2e/rollout_test.go b/test/e2e/rollout_test.go
@@ -434,26 +434,46 @@ var _ = SIGDescribe("Rollout", func() {
 					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
 						Traffic: utilpointer.String("20%"),
 					},
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "20%",
+					},
 				},
 				{
 					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
 						Traffic: utilpointer.String("40%"),
 					},
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "40%",
+					},
 				},
 				{
 					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
 						Traffic: utilpointer.String("60%"),
 					},
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "60%",
+					},
 				},
 				{
 					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
 						Traffic: utilpointer.String("80%"),
 					},
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "80%",
+					},
 				},
 				{
 					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
 						Traffic: utilpointer.String("90%"),
 					},
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "90%",
+					},
 				},
 			}
 			rollout.Spec.Strategy.Canary.PatchPodTemplateMetadata = &v1beta1.PatchPodTemplateMetadata{
@@ -609,6 +629,10 @@ var _ = SIGDescribe("Rollout", func() {
 					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
 						Traffic: utilpointer.String("60%"),
 					},
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "60%",
+					},
 					Pause: v1beta1.RolloutPause{},
 				},
 			}
@@ -887,28 +911,48 @@ var _ = SIGDescribe("Rollout", func() {
 					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
 						Traffic: utilpointer.String("20%"),
 					},
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "20%",
+					},
 				},
 				{
 					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
 						Traffic: utilpointer.String("40%"),
 					},
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "40%",
+					},
 				},
 				{
 					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
 						Traffic: utilpointer.String("60%"),
 					},
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "60%",
+					},
 					Pause: v1beta1.RolloutPause{Duration: utilpointer.Int32(10)},
 				},
 				{
 					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
 						Traffic: utilpointer.String("80%"),
 					},
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "80%",
+					},
 					Pause: v1beta1.RolloutPause{Duration: utilpointer.Int32(10)},
 				},
 				{
 					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
 						Traffic: utilpointer.String("100%"),
 					},
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "100%",
+					},
 					Pause: v1beta1.RolloutPause{Duration: utilpointer.Int32(1)},
 				},
 			}
@@ -1074,6 +1118,10 @@ var _ = SIGDescribe("Rollout", func() {
 					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
 						Traffic: utilpointer.String("20%"),
 					},
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "20%",
+					},
 					Pause: v1beta1.RolloutPause{
 						Duration: utilpointer.Int32(10),
 					},
@@ -1082,12 +1130,20 @@ var _ = SIGDescribe("Rollout", func() {
 					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
 						Traffic: utilpointer.String("40%"),
 					},
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "40%",
+					},
 					Pause: v1beta1.RolloutPause{},
 				},
 				{
 					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
 						Traffic: utilpointer.String("60%"),
 					},
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "60%",
+					},
 					Pause: v1beta1.RolloutPause{
 						Duration: utilpointer.Int32(10),
 					},
@@ -1096,6 +1152,10 @@ var _ = SIGDescribe("Rollout", func() {
 					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
 						Traffic: utilpointer.String("100%"),
 					},
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "100%",
+					},
 					Pause: v1beta1.RolloutPause{
 						Duration: utilpointer.Int32(0),
 					},
@@ -1215,6 +1275,10 @@ var _ = SIGDescribe("Rollout", func() {
 					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
 						Traffic: utilpointer.String("20%"),
 					},
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "20%",
+					},
 					Pause: v1beta1.RolloutPause{
 						Duration: utilpointer.Int32(10),
 					},
@@ -1223,6 +1287,10 @@ var _ = SIGDescribe("Rollout", func() {
 					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
 						Traffic: utilpointer.String("40%"),
 					},
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "40%",
+					},
 					Pause: v1beta1.RolloutPause{
 						Duration: utilpointer.Int32(10),
 					},
@@ -1231,12 +1299,20 @@ var _ = SIGDescribe("Rollout", func() {
 					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
 						Traffic: utilpointer.String("60%"),
 					},
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "60%",
+					},
 					Pause: v1beta1.RolloutPause{},
 				},
 				{
 					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
 						Traffic: utilpointer.String("100%"),
 					},
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "100%",
+					},
 					Pause: v1beta1.RolloutPause{
 						Duration: utilpointer.Int32(0),
 					},
@@ -1349,40 +1425,45 @@ var _ = SIGDescribe("Rollout", func() {
 			Expect(ReadYamlToObject("./test_data/rollout/rollout_canary_base.yaml", rollout)).ToNot(HaveOccurred())
 			rollout.Spec.Strategy.Canary.Steps = []v1beta1.CanaryStep{
 				{
-					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
-						Traffic: utilpointer.String("20%"),
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "20%",
 					},
 					Pause: v1beta1.RolloutPause{
 						Duration: utilpointer.Int32(5),
 					},
 				},
 				{
-					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
-						Traffic: utilpointer.String("40%"),
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "40%",
 					},
 					Pause: v1beta1.RolloutPause{
 						Duration: utilpointer.Int32(5),
 					},
 				},
 				{
-					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
-						Traffic: utilpointer.String("60%"),
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "60%",
 					},
 					Pause: v1beta1.RolloutPause{
 						Duration: utilpointer.Int32(5),
 					},
 				},
 				{
-					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
-						Traffic: utilpointer.String("80%"),
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "80%",
 					},
 					Pause: v1beta1.RolloutPause{
 						Duration: utilpointer.Int32(5),
 					},
 				},
 				{
-					TrafficRoutingStrategy: v1beta1.TrafficRoutingStrategy{
-						Traffic: utilpointer.String("100%"),
+					Replicas: &intstr.IntOrString{
+						Type:   intstr.String,
+						StrVal: "100%",
 					},
 					Pause: v1beta1.RolloutPause{
 						Duration: utilpointer.Int32(0),

diff --git a/test/e2e/test_data/customNetworkProvider/rollout_without_trafficrouting.yaml b/test/e2e/test_data/customNetworkProvider/rollout_without_trafficrouting.yaml
@@ -1,18 +1,17 @@
-  apiVersion: rollouts.kruise.io/v1alpha1
-  kind: Rollout
-  metadata:
-    name: rollouts-demo
-    annotations:
-      rollouts.kruise.io/rolling-style: canary
-      rollouts.kruise.io/trafficrouting: tr-demo
-  spec:
-    disabled: false
-    objectRef:
-      workloadRef:
-        apiVersion: apps/v1
-        kind: Deployment
-        name: echoserver
-    strategy:
-      canary:
-        steps:
-        - replicas: 1
+apiVersion: rollouts.kruise.io/v1beta1
+kind: Rollout
+metadata:
+  name: rollouts-demo
+  annotations:
+    rollouts.kruise.io/rolling-style: canary
+    rollouts.kruise.io/trafficrouting: tr-demo
+spec:
+  disabled: false
+  workloadRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: echoserver
+  strategy:
+    canary:
+      steps:
+      - replicas: 1
diff --git a/test/e2e/test_data/rollout/rollout_canary_base.yaml b/test/e2e/test_data/rollout/rollout_canary_base.yaml
@@ -1,25 +1,29 @@
-apiVersion: rollouts.kruise.io/v1alpha1
+apiVersion: rollouts.kruise.io/v1beta1
 kind: Rollout
 metadata:
   name: rollouts-demo
 spec:
-  objectRef:
-    workloadRef:
-      apiVersion: apps/v1
-      kind: Deployment
-      name: echoserver
+  workloadRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: echoserver
   strategy:
     canary:
       steps:
-      - weight: 20
+      - replicas: "20%"
+        weight: "20%"
         pause: {}
-      - weight: 40
+      - replicas: "40%"
+        weight: "40%"
         pause: {duration: 10}
-      - weight: 60
+      - replicas: "60%"
+        weight: "60%"
         pause: {duration: 10}
-      - weight: 80
+      - replicas: "80%"
+        weight: "80%"
         pause: {duration: 10}
-      - weight: 100
+      - replicas: "100%"
+        weight: "100%"
         pause: {duration: 0}
       trafficRoutings:
       - service: echoserver

diff --git a/test/e2e/test_data/rollout/rollout_canary_daemonset_base.yaml b/test/e2e/test_data/rollout/rollout_canary_daemonset_base.yaml
@@ -1,4 +1,4 @@
-apiVersion: rollouts.kruise.io/v1alpha1
+apiVersion: rollouts.kruise.io/v1beta1
 kind: Rollout
 metadata:
   name: rollouts-test
@@ -8,14 +8,13 @@ metadata:
   annotations:
     rollouts.kruise.io/rolling-style: partition
 spec:
-  objectRef:
-    # rollout of published workloads, currently only supports Deployment, CloneSet, StatefulSet, Advanced StatefulSet
-    workloadRef:
-      apiVersion: apps.kruise.io/v1alpha1
-      kind: DaemonSet
-      name: fluentd-elasticsearch
+  # rollout of published workloads, currently only supports Deployment, CloneSet, StatefulSet, Advanced StatefulSet
+  workloadRef:
+    apiVersion: apps.kruise.io/v1alpha1
+    kind: DaemonSet
+    name: fluentd-elasticsearch
   strategy:
     canary:
       steps:
       - replicas: 1
-      - replicas: 100%
+      - replicas: "100%"
diff --git a/test/e2e/test_data/rollout/rollout_canary_daemonset_interrupt.yaml b/test/e2e/test_data/rollout/rollout_canary_daemonset_interrupt.yaml
@@ -1,4 +1,4 @@
-apiVersion: rollouts.kruise.io/v1alpha1
+apiVersion: rollouts.kruise.io/v1beta1
 kind: Rollout
 metadata:
   name: rollouts-test
@@ -8,15 +8,14 @@ metadata:
   annotations:
     rollouts.kruise.io/rolling-style: partition
 spec:
-  objectRef:
-    # rollout of published workloads, currently only supports Deployment, CloneSet, StatefulSet, Advanced StatefulSet
-    workloadRef:
-      apiVersion: apps.kruise.io/v1alpha1
-      kind: DaemonSet
-      name: fluentd-elasticsearch
+  # rollout of published workloads, currently only supports Deployment, CloneSet, StatefulSet, Advanced StatefulSet
+  workloadRef:
+    apiVersion: apps.kruise.io/v1alpha1
+    kind: DaemonSet
+    name: fluentd-elasticsearch
   strategy:
     canary:
       steps:
       - replicas: 1
       - replicas: 2
-      - replicas: 100%
+      - replicas: "100%"