Enable multiple kustomizations in the kustomize deployer

docs/content/en/docs/pipeline-stages/deployers.md

@@ -122,6 +122,8 @@ The `kustomize` type offers the following options:
 
 {{< schema root="KustomizeDeploy" >}}
 
+Each entry in `paths` should point to a folder with a kustomization file.
+
 `flags` section offers the following options:
 
 {{< schema root="KubectlFlags" >}}

docs/content/en/samples/deployers/kustomize.yaml

@@ -3,4 +3,4 @@ deploy:
 # The deploy section above is equal to
 # deploy:
 #   kustomize:
-#     path: "."
+#     paths: ["."]

docs/content/en/schemas/v2alpha3.json

@@ -1559,15 +1559,18 @@
           "description": "additional flags passed to `kubectl`.",
           "x-intellij-html-description": "additional flags passed to <code>kubectl</code>."
         },
-        "path": {
-          "type": "string",
+        "paths": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array",
           "description": "path to Kustomization files.",
           "x-intellij-html-description": "path to Kustomization files.",
           "default": "."
         }
       },
       "preferredOrder": [
-        "path",
+        "paths",
         "flags",
         "buildArgs"
       ],

integration/testdata/deploy-multiple/skaffold.yaml

@@ -6,7 +6,8 @@ build:
       context: ./kubectl
 deploy:
   kustomize:
-    path: ./kustomize
+    paths:
+    - ./kustomize
 
   kubectl:
     manifests:

pkg/skaffold/deploy/deploy_mux.go

@@ -49,7 +49,7 @@ func (s stringSet) insert(strings ...string) {
 
 // toList returns the sorted list of inserted strings.
 func (s stringSet) toList() []string {
-	res := make([]string, 0, len(s))
+	var res []string
 	for item := range s {
 		res = append(res, item)
 	}

pkg/skaffold/deploy/kustomize.go

@@ -173,7 +173,15 @@ func (k *KustomizeDeployer) Cleanup(ctx context.Context, out io.Writer) error {
 
 // Dependencies lists all the files that can change what needs to be deployed.
 func (k *KustomizeDeployer) Dependencies() ([]string, error) {
-	return dependenciesForKustomization(k.KustomizePath)
+	deps := newStringSet()
+	for _, kustomizePath := range k.KustomizePaths {
+		depsForKustomization, err := dependenciesForKustomization(kustomizePath)
+		if err != nil {
+			return nil, err
+		}
+		deps.insert(depsForKustomization...)
+	}
+	return deps.toList(), nil
 }
 
 func (k *KustomizeDeployer) Render(ctx context.Context, out io.Writer, builds []build.Artifact, filepath string) error {
@@ -280,18 +288,19 @@ func pathExistsLocally(filename string, workingDir string) (bool, os.FileMode) {
 }
 
 func (k *KustomizeDeployer) readManifests(ctx context.Context) (deploy.ManifestList, error) {
-	cmd := exec.CommandContext(ctx, "kustomize", buildCommandArgs(k.BuildArgs, k.KustomizePath)...)
-	out, err := util.RunCmdOut(cmd)
-	if err != nil {
-		return nil, errors.Wrap(err, "kustomize build")
-	}
+	var manifests deploy.ManifestList
+	for _, kustomizePath := range k.KustomizePaths {
+		cmd := exec.CommandContext(ctx, "kustomize", buildCommandArgs(k.BuildArgs, kustomizePath)...)
+		out, err := util.RunCmdOut(cmd)
+		if err != nil {
+			return nil, errors.Wrap(err, "kustomize build")
+		}
 
-	if len(out) == 0 {
-		return nil, nil
+		if len(out) == 0 {
+			continue
+		}
+		manifests.Append(out)
 	}
-
-	var manifests deploy.ManifestList
-	manifests.Append(out)
 	return manifests, nil
 }