remove roll back

Signed-off-by: Kuromesi <[email protected]>

lua_configuration/lua.go

@@ -42,6 +42,10 @@ func PathWalk() error {
 			return fmt.Errorf("failed to walk path: %s", err.Error())
 		}
 		dir := filepath.Dir(path)
+		if _, err := os.Stat(filepath.Join(dir, "testdata")); err != nil {
+			fmt.Printf("testdata not found in %s\n", dir)
+			return nil
+		}
 		err = filepath.Walk(filepath.Join(dir, "testdata"), func(path string, info os.FileInfo, err error) error {
 			if !info.IsDir() && filepath.Ext(path) == ".yaml" || filepath.Ext(path) == ".yml" {
 				fmt.Printf("--- walking path: %s ---\n", path)
@@ -82,11 +86,7 @@ func ObjectToTable(path string) error {
 			}
 			var canaryService string
 			stableService := rollout.Spec.Strategy.Canary.TrafficRoutings[0].Service
-			// if rollout.Spec.Strategy.Canary.TrafficRoutings[0].CreateCanaryService {
 			canaryService = fmt.Sprintf("%s-canary", stableService)
-			// } else {
-			// 	canaryService = stableService
-			// }
 			data := &custom.LuaData{
 				Data: custom.Data{
 					Labels:      testCase.Original.GetLabels(),

pkg/controller/trafficrouting/trafficrouting_controller.go

@@ -97,6 +97,7 @@ func (r *TrafficRoutingReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 	newStatus := tr.Status.DeepCopy()
 	if newStatus.Phase == "" {
 		newStatus.Phase = v1alpha1.TrafficRoutingPhaseInitial
+		newStatus.Message = "TrafficRouting is Initializing"
 	}
 	if !tr.DeletionTimestamp.IsZero() {
 		newStatus.Phase = v1alpha1.TrafficRoutingPhaseTerminating
@@ -124,8 +125,8 @@ func (r *TrafficRoutingReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 	case v1alpha1.TrafficRoutingPhaseFinalizing:
 		done, err = r.trafficRoutingManager.FinalisingTrafficRouting(newTrafficRoutingContext(tr), false)
 		if done {
-			newStatus.Phase = v1alpha1.TrafficRoutingPhaseHealthy
-			newStatus.Message = "TrafficRouting is Healthy"
+			newStatus.Phase = v1alpha1.TrafficRoutingPhaseInitial
+			newStatus.Message = "TrafficRouting is Initializing"
 		}
 	case v1alpha1.TrafficRoutingPhaseTerminating:
 		done, err = r.trafficRoutingManager.FinalisingTrafficRouting(newTrafficRoutingContext(tr), false)

pkg/trafficrouting/network/custom/custom.go

@@ -42,7 +42,7 @@ import (
 )
 
 const (
-	OriginalSpecAnnotation = "rollouts.kruise.io/origin-spec-configuration"
+	OriginalSpecAnnotation = "rollouts.kruise.io/original-spec-configuration"
 	LuaConfigMap           = "kruise-rollout-configuration"
 )
 
@@ -86,7 +86,6 @@ func NewCustomController(client client.Client, conf Config) (network.NetworkProv
 }
 
 // when initializing, first check lua and get all custom providers, then store custom providers
-// once fails to store a custom provider, roll back custom providers previously (assume error should not occur)
 func (r *customController) Initialize(ctx context.Context) error {
 	customNetworkRefList := make([]*unstructured.Unstructured, 0)
 	for _, ref := range r.conf.TrafficConf {
@@ -110,40 +109,19 @@ func (r *customController) Initialize(ctx context.Context) error {
 		err := r.storeObject(nObj)
 		if err != nil {
 			klog.Errorf("failed to store custom network provider %s(%s/%s): %s", customNetworkRefList[i].GetKind(), r.conf.RolloutNs, customNetworkRefList[i].GetName(), err.Error())
-			klog.Errorf("roll back custom network providers previously")
-			r.rollBack(customNetworkRefList, i)
 			return err
 		}
-		customNetworkRefList[i] = nObj
 	}
 	return nil
 }
 
 // when ensuring routes, first execute lua for all custom providers, then update
-// once fails to update a custom provider, roll back custom providers previously (assume error should not occur)
 func (r *customController) EnsureRoutes(ctx context.Context, strategy *rolloutv1alpha1.TrafficRoutingStrategy) (bool, error) {
 	done := true
 	// *strategy.Weight == 0 indicates traffic routing is doing finalising and tries to route whole traffic to stable service
-	// then restore custom network provider directly
+	// then directly do finalising
 	if strategy.Weight != nil && *strategy.Weight == 0 {
-		for _, ref := range r.conf.TrafficConf {
-			obj := &unstructured.Unstructured{}
-			obj.SetAPIVersion(ref.APIVersion)
-			obj.SetKind(ref.Kind)
-			if err := r.Get(ctx, types.NamespacedName{Namespace: r.conf.RolloutNs, Name: ref.Name}, obj); err != nil {
-				klog.Errorf("failed to get %s(%s/%s) when routing whole traffic to stable service", ref.Kind, r.conf.RolloutNs, ref.Name)
-				return false, err
-			}
-			changed, err := r.restoreObject(obj, true)
-			if err != nil {
-				klog.Errorf("failed to restore %s(%s/%s) when routing whole traffic to stable service", ref.Kind, r.conf.RolloutNs, ref.Name)
-				return false, err
-			}
-			if changed {
-				done = false
-			}
-		}
-		return done, nil
+		return true, nil
 	}
 	var err error
 	nSpecList := make([]Data, 0)
@@ -184,13 +162,9 @@ func (r *customController) EnsureRoutes(ctx context.Context, strategy *rolloutv1
 		}
 		if err = r.Update(context.TODO(), nObj); err != nil {
 			klog.Errorf("failed to update custom network provider %s(%s/%s) from (%s) to (%s)", nObj.GetKind(), r.conf.RolloutNs, nObj.GetName(), util.DumpJSON(customNetworkRefList[i]), util.DumpJSON(nObj))
-			// if fails to update, restore the previous CustomNetworkRefs
-			klog.Errorf("roll back custom network providers previously")
-			r.rollBack(customNetworkRefList, i)
 			return false, err
 		}
 		klog.Infof("update custom network provider %s(%s/%s) from (%s) to (%s) success", nObj.GetKind(), r.conf.RolloutNs, nObj.GetName(), util.DumpJSON(customNetworkRefList[i]), util.DumpJSON(nObj))
-		customNetworkRefList[i] = nObj
 		done = false
 	}
 	return done, nil
@@ -211,25 +185,13 @@ func (r *customController) Finalise(ctx context.Context) error {
 			done = false
 			continue
 		}
-		if _, err := r.restoreObject(obj, false); err != nil {
+		if err := r.restoreObject(obj); err != nil {
 			done = false
 			klog.Errorf("failed to restore %s(%s/%s) when finalising: %s", ref.Kind, r.conf.RolloutNs, ref.Name, err.Error())
 		}
 	}
 	if !done {
-		return fmt.Errorf("finalising work is not done")
-	}
-	return nil
-}
-
-// roll back custom network provider previous to failedIdx
-func (r *customController) rollBack(customNetworkRefList []*unstructured.Unstructured, failedIdx int) error {
-	for j := 0; j < failedIdx; j++ {
-		if _, err := r.restoreObject(customNetworkRefList[j].DeepCopy(), true); err != nil {
-			klog.Errorf("failed to roll back custom network provider %s(%s/%s): %s", customNetworkRefList[j].GetKind(), r.conf.RolloutNs, customNetworkRefList[j].GetName(), err.Error())
-			continue
-		}
-		klog.Infof("roll back custom network provider %s(%s/%s) success", customNetworkRefList[j].GetKind(), r.conf.RolloutNs, customNetworkRefList[j].GetName())
+		return fmt.Errorf("finalising work for %s is not done", r.conf.Key)
 	}
 	return nil
 }
@@ -262,44 +224,25 @@ func (r *customController) storeObject(obj *unstructured.Unstructured) error {
 	return nil
 }
 
-// restore an object from spec stored in OriginalSpecAnnotation, needStoreOriginalSpec indicates whether the original spec should be stored
-// if needStoreOriginalSpec is false, indicates traffic routing is doing finalising
-// if needStoreOriginalSpec is true, indicates traffic routing failed when ensuring routes and is rolling back or in finalising
-func (r *customController) restoreObject(obj *unstructured.Unstructured, needStoreOriginalSpec bool) (bool, error) {
-	changed := false
+// restore an object from spec stored in OriginalSpecAnnotation
+func (r *customController) restoreObject(obj *unstructured.Unstructured) error {
 	annotations := obj.GetAnnotations()
 	if annotations == nil || annotations[OriginalSpecAnnotation] == "" {
 		klog.Infof("OriginalSpecAnnotation not found in custom network provider %s(%s/%s)")
-		return changed, nil
+		return nil
 	}
 	oSpecStr := annotations[OriginalSpecAnnotation]
 	var oSpec Data
 	_ = json.Unmarshal([]byte(oSpecStr), &oSpec)
-	if needStoreOriginalSpec {
-		// when the traffic routing is rolling back, first check whether current spec equals to original spec, if equals, then just return
-		// this is not a concern when traffic routing is doing finalising, since the OriginalSpecAnnotation should be removed and network provider always need to be updated
-		delete(annotations, OriginalSpecAnnotation)
-		data := Data{
-			Spec:        obj.Object["spec"],
-			Labels:      obj.GetLabels(),
-			Annotations: annotations,
-		}
-		cSpecStr := util.DumpJSON(data)
-		if oSpecStr == cSpecStr {
-			return changed, nil
-		}
-		oSpec.Annotations[OriginalSpecAnnotation] = oSpecStr
-	}
 	obj.Object["spec"] = oSpec.Spec
 	obj.SetAnnotations(oSpec.Annotations)
 	obj.SetLabels(oSpec.Labels)
 	if err := r.Update(context.TODO(), obj); err != nil {
 		klog.Errorf("failed to restore object %s(%s/%s) from annotation(%s): %s", obj.GetKind(), r.conf.RolloutNs, obj.GetName(), OriginalSpecAnnotation, err.Error())
-		return changed, err
+		return err
 	}
-	changed = true
 	klog.Infof("restore custom network provider %s(%s/%s) from annotation(%s) success", obj.GetKind(), obj.GetNamespace(), obj.GetName(), OriginalSpecAnnotation)
-	return changed, nil
+	return nil
 }
 
 func (r *customController) executeLuaForCanary(spec Data, strategy *rolloutv1alpha1.TrafficRoutingStrategy, luaScript string) (Data, error) {