Merge pull request #11621 from johngmyers/automated-cherry-pick-of-#1…

…1619-upstream-release-1.21 Automated cherry pick of #11619: Fix duplicate CopyFile tasks
kubernetes · May 28, 2021 · bc556f8 · bc556f8
2 parents 9e5a3d7 + 9e673ce
commit bc556f8
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/upup/pkg/fi/cloudup/loader.go b/upup/pkg/fi/cloudup/loader.go
@@ -116,7 +116,9 @@ func (l *Loader) addAssetFileCopyTasks(assets []*assets.FileAsset, lifecycle *fi
 				Lifecycle:  lifecycle,
 			}
 
-			context.AddTask(copyFileTask)
+			if err := context.EnsureTask(copyFileTask); err != nil {
+				return fmt.Errorf("error adding asset-copy task: %v", err)
+			}
 			l.tasks = context.Tasks
 
 		}