Feat: add controller version in backup controller (#114)

Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com> Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>
kubevela · Jan 11, 2023 · 555573c · 555573c
1 parent ad226c2
commit 555573c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -251,8 +251,9 @@ func main() {
 			os.Exit(1)
 		}
 		if err = (&controllers.BackupReconciler{
-			Client: kubeClient,
-			Scheme: mgr.GetScheme(),
+			Client:            kubeClient,
+			Scheme:            mgr.GetScheme(),
+			ControllerVersion: version.VelaVersion,
 			BackupArgs: controllers.BackupArgs{
 				BackupStrategy: backupStrategy,
 				IgnoreStrategy: backupIgnoreStrategy,

diff --git a/controllers/backup_controller.go b/controllers/backup_controller.go
@@ -41,7 +41,8 @@ import (
 // BackupReconciler reconciles a WorkflowRun object
 type BackupReconciler struct {
 	client.Client
-	Scheme *runtime.Scheme
+	Scheme            *runtime.Scheme
+	ControllerVersion string
 	BackupArgs
 	Args
 }
@@ -87,6 +88,11 @@ func (r *BackupReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
+	if !r.matchControllerRequirement(run) {
+		logCtx.Info("skip workflowrun: not match the controller requirement of workflowrun")
+		return ctrl.Result{}, nil
+	}
+
 	if !run.Status.Finished {
 		logCtx.Info("WorkflowRun is not finished, skip reconcile")
 		return ctrl.Result{}, nil
@@ -144,6 +150,18 @@ func (r *BackupReconciler) backup(ctx monitorContext.Context, cli client.Client,
 	return nil
 }
 
+func (r *BackupReconciler) matchControllerRequirement(wr *v1alpha1.WorkflowRun) bool {
+	if wr.Annotations != nil {
+		if requireVersion, ok := wr.Annotations[types.AnnotationControllerRequirement]; ok {
+			return requireVersion == r.ControllerVersion
+		}
+	}
+	if r.IgnoreWorkflowWithoutControllerRequirement {
+		return false
+	}
+	return true
+}
+
 // SetupWithManager sets up the controller with the Manager.
 func (r *BackupReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).