Move logic to clear workflow CRD managed fields to passthrough workfl…

…owstore
flyteorg · Oct 20, 2022 · c3dd588 · c3dd588
1 parent 7ffb502
commit c3dd588
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/pkg/controller/workflowstore/passthrough.go b/pkg/controller/workflowstore/passthrough.go
@@ -76,6 +76,14 @@ func (p *passthroughWorkflowStore) UpdateStatus(ctx context.Context, workflow *v
 
 func (p *passthroughWorkflowStore) Update(ctx context.Context, workflow *v1alpha1.FlyteWorkflow, priorityClass PriorityClass) (
 	newWF *v1alpha1.FlyteWorkflow, err error) {
+	// If the workflow has any managed fields setting the array to one empty ManagedField clears them in the CRD.
+	// FlyteWorkflow CRDs are only managed by a single FlytePropeller instance and therefore the managed fields paradigm
+	// does not add useful functionality. Clearing them reduces CRD size, improving etcd I/O performance.
+	if len(workflow.ObjectMeta.ManagedFields) > 0 {
+		workflow.ObjectMeta.ManagedFields = workflow.ObjectMeta.ManagedFields[:1]
+		workflow.ObjectMeta.ManagedFields[0] = v1.ManagedFieldsEntry{}
+	}
+
 	p.metrics.workflowUpdateCount.Inc()
 	// Something has changed. Lets save
 	logger.Debugf(ctx, "Observed FlyteWorkflow Update (maybe finalizer)")

diff --git a/pkg/controller/workflowstore/resource_version_caching.go b/pkg/controller/workflowstore/resource_version_caching.go
@@ -109,14 +109,6 @@ func (r *resourceVersionCaching) UpdateStatus(ctx context.Context, workflow *v1a
 
 func (r *resourceVersionCaching) Update(ctx context.Context, workflow *v1alpha1.FlyteWorkflow, priorityClass PriorityClass) (
 	newWF *v1alpha1.FlyteWorkflow, err error) {
-	// If the workflow has any managed fields setting the array to one empty ManagedField clears them in the CRD.
-	// FlyteWorkflow CRDs are only managed by a single FlytePropeller instance and therefore the managed fields paradigm
-	// does not add useful functionality. Clearing them reduces CRD size, improving etcd I/O performance.
-	if len(workflow.ObjectMeta.ManagedFields) > 0 {
-		workflow.ObjectMeta.ManagedFields = workflow.ObjectMeta.ManagedFields[:1]
-		workflow.ObjectMeta.ManagedFields[0] = metav1.ManagedFieldsEntry{}
-	}
-
 	newWF, err = r.w.Update(ctx, workflow, priorityClass)
 	if err != nil {
 		return nil, err