fix: correctly rewrite /deploy/kubectl/manifests in patch upgrades (#…

…8585)
GoogleContainerTools · Mar 25, 2023 · e0fea66 · e0fea66
1 parent 4694d64
commit e0fea66
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/skaffold/schema/v2beta29/upgrade.go b/pkg/skaffold/schema/v2beta29/upgrade.go
@@ -36,7 +36,7 @@ import (
 var artifactOverridesRegexp = regexp.MustCompile("/deploy/helm/releases/[0-9]+/artifactOverrides/image")
 
 var migrations = map[string]string{
-	"/deploy/kubectl":             "/manifests/rawYaml",
+	"/deploy/kubectl/manifests":   "/manifests/rawYaml",
 	"/deploy/kustomize/paths":     "/manifests/kustomize/paths",
 	"/deploy/kustomize/buildArgs": "/manifests/kustomize/buildArgs",
 	"/deploy/helm":                "/manifests/helm",

diff --git a/pkg/skaffold/schema/v2beta29/upgrade_test.go b/pkg/skaffold/schema/v2beta29/upgrade_test.go
@@ -245,7 +245,9 @@ profiles:
 - name: kustomize
   patches:
   - op: remove
-    path: /deploy/kubectl
+    path: /deploy/kubectl/manifests
+  - op: remove
+    path: /deploy/kubectl/manifests/0
   - op: remove
     path: /deploy/helm
   deploy:
@@ -273,6 +275,8 @@ profiles:
   patches:
   - op: remove
     path: /manifests/rawYaml
+  - op: remove
+    path: /manifests/rawYaml/0
   - op: remove
     path: /manifests/helm
   - op: remove