add unit tests and e2e tests

Signed-off-by: Kuromesi <[email protected]>
Kuromesi · Aug 24, 2023 · 9d40b60 · 9d40b60
1 parent 03c792b
commit 9d40b60
Show file tree

Hide file tree

Showing 15 changed files with 553 additions and 11 deletions.
diff --git a/config/crd/bases/rollouts.kruise.io_rollouts.yaml b/config/crd/bases/rollouts.kruise.io_rollouts.yaml
@@ -341,7 +341,7 @@ spec:
                             traffic routing
                           properties:
                             createCanaryService:
-                              default: false
+                              default: true
                               description: create a new canary service or just use
                                 the stable service
                               type: boolean

diff --git a/config/crd/bases/rollouts.kruise.io_trafficroutings.yaml b/config/crd/bases/rollouts.kruise.io_trafficroutings.yaml
@@ -55,7 +55,7 @@ spec:
                     routing
                   properties:
                     createCanaryService:
-                      default: false
+                      default: true
                       description: create a new canary service or just use the stable
                         service
                       type: boolean

diff --git a/pkg/controller/trafficrouting/trafficrouting_controller_test.go b/pkg/controller/trafficrouting/trafficrouting_controller_test.go
@@ -116,7 +116,8 @@ var (
 		Spec: v1alpha1.TrafficRoutingSpec{
 			ObjectRef: []v1alpha1.TrafficRoutingRef{
 				{
-					Service: "echoserver",
+					Service:             "echoserver",
+					CreateCanaryService: false,
 					Ingress: &v1alpha1.IngressTrafficRouting{
 						Name: "echoserver",
 					},
@@ -379,6 +380,7 @@ func TestTrafficRoutingTest(t *testing.T) {
 			for _, obj := range ig {
 				checkObjEqual(client, t, obj)
 			}
+			manager.trafficRoutingManager.RemoveTrafficRoutingController(newTrafficRoutingContext(tr))
 		})
 	}
 }

diff --git a/pkg/trafficrouting/manager_test.go b/pkg/trafficrouting/manager_test.go
@@ -666,6 +666,7 @@ func TestFinalisingTrafficRouting(t *testing.T) {
 			}
 			manager := NewTrafficRoutingManager(client)
 			done, err := manager.FinalisingTrafficRouting(c, cs.onlyRestoreStableService)
+			manager.RemoveTrafficRoutingController(c)
 			if err != nil {
 				t.Fatalf("DoTrafficRouting failed: %s", err)
 			}

diff --git a/pkg/trafficrouting/network/custom/custom.go b/pkg/trafficrouting/network/custom/custom.go
@@ -188,10 +188,8 @@ func (r *customController) storeObject(obj *unstructured.Unstructured) error {
 	}
 	annotations[OriginalSpecAnnotation] = cSpec
 	obj.SetAnnotations(annotations)
-	if err := r.Update(context.TODO(), obj); err != nil {
-		return err
-	}
-	return nil
+	err := r.Update(context.TODO(), obj)
+	return err
 }
 
 // restore an object from spec stored in OriginalSpecAnnotation
@@ -206,10 +204,8 @@ func (r *customController) restoreObject(obj *unstructured.Unstructured) error {
 	obj.Object["spec"] = oSpec.Spec
 	obj.SetAnnotations(oSpec.Annotations)
 	obj.SetLabels(oSpec.Labels)
-	if err := r.Update(context.TODO(), obj); err != nil {
-		return err
-	}
-	return nil
+	err := r.Update(context.TODO(), obj)
+	return err
 }
 
 func (r *customController) executeLuaForCanary(spec Data, strategy *rolloutv1alpha1.TrafficRoutingStrategy, luaScript string) (Data, error) {