fix: reverse order of deployers during cleanup (GoogleContainerTools#…

…7284)
chronicc · Oct 6, 2022 · a1bbb01 · a1bbb01
1 parent c50ca8a
commit a1bbb01
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pkg/skaffold/deploy/deploy_mux.go b/pkg/skaffold/deploy/deploy_mux.go
@@ -161,6 +161,12 @@ func (m DeployerMux) Dependencies() ([]string, error) {
 }
 
 func (m DeployerMux) Cleanup(ctx context.Context, w io.Writer, dryRun bool, manifestsByConfig manifest.ManifestListByConfig) error {
+	// Reverse order of deployers for cleanup to ensure resources
+	// are removed before their definitions are removed.
+	revDeployers := m.deployers
+	for i, j := 0, len(revDeployers)-1; i < j; i, j = i+1, j-1 {
+		revDeployers[i], revDeployers[j] = revDeployers[j], revDeployers[i]
+	}
 	for _, deployer := range m.deployers {
 		ctx, endTrace := instrumentation.StartTrace(ctx, "Cleanup")
 		if dryRun {