test commit

Makefile

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 GOOS ?= $(shell go env GOOS)
 GOARCH = amd64
 BUILD_DIR ?= ./out

docs/content/en/schemas/v1beta15.json

@@ -1417,6 +1417,15 @@
     },
     "KustomizeDeploy": {
       "properties": {
+        "buildArgs": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array",
+          "description": "additional args passed to `kustomize build`.",
+          "x-intellij-html-description": "additional args passed to <code>kustomize build</code>.",
+          "default": "[]"
+        },
         "flags": {
           "$ref": "#/definitions/KubectlFlags",
           "description": "additional flags passed to `kubectl`.",
@@ -1431,7 +1440,8 @@
       },
       "preferredOrder": [
         "path",
-        "flags"
+        "flags",
+        "buildArgs"
       ],
       "additionalProperties": false,
       "description": "*beta* uses the `kustomize` CLI to \"patch\" a deployment for a target environment.",

integration/examples/kustomize/README.adoc

@@ -28,3 +28,17 @@ include::deployment.yaml[]
 ----
 
 endif::[]
+
+=== Example: passing arguments to kustomize
+:icons: font
+
+This is an example demonstrating how additional arguments can be passed to the `kustomize build` command.
+
+ifndef::env-github[]
+
+[source,yaml, indent=3, title=skaffold-kustomize-args.yaml]
+----
+include::skaffold-kustomize-args.yaml[]
+----
+
+endif::[]

integration/examples/kustomize/skaffold-kustomize-args.yaml

@@ -0,0 +1,6 @@
+apiVersion: skaffold/v1beta14
+kind: Config
+deploy:
+  kustomize:
+    buildArgs:
+      - "--load_restrictor none"

pkg/skaffold/deploy/kustomize.go

@@ -85,6 +85,7 @@ func NewKustomizeDeployer(runCtx *runcontext.RunContext) *KustomizeDeployer {
 		},
 		defaultRepo:        runCtx.DefaultRepo,
 		insecureRegistries: runCtx.InsecureRegistries,
+		BuildArgs:          runCtx.Cfg.Deploy.KustomizeDeploy.BuildArgs,
 	}
 }
 

pkg/skaffold/deploy/resource/deployment.go

@@ -82,9 +82,3 @@ func NewDeployment(name string, ns string, deadline time.Duration) *Deployment {
 		status:    newStatus("", nil),
 	}
 }
-
-// For testing
-func (d *Deployment) WithStatus(details string, err error) *Deployment {
-	d.UpdateStatus(details, err)
-	return d
-}

pkg/skaffold/deploy/status_check.go

@@ -81,7 +81,7 @@ func StatusCheck(ctx context.Context, defaultLabeller *DefaultLabeller, runCtx *
 			defer wg.Done()
 			pollDeploymentRolloutStatus(ctx, kubectl.NewFromRunContext(runCtx), d)
 			pending := c.markProcessed()
-			printStatusCheckSummary(d, pending, c.total, out)
+			printStatusCheckSummary(out, d, pending, c.total)
 		}(d)
 	}
 
@@ -166,7 +166,7 @@ func getDeadline(d int) time.Duration {
 	return defaultStatusCheckDeadline
 }
 
-func printStatusCheckSummary(d *resource.Deployment, pending int, total int, out io.Writer) {
+func printStatusCheckSummary(out io.Writer, d *resource.Deployment, pending int, total int) {
 	status := fmt.Sprintf("%s %s", tabHeader, d)
 	if err := d.Status().Error(); err != nil {
 		status = fmt.Sprintf("%s failed.%s Error: %s.",

pkg/skaffold/deploy/status_check_test.go

@@ -258,32 +258,52 @@ func TestGetDeployStatus(t *testing.T) {
 		{
 			description: "one error",
 			deps: []*resource.Deployment{
-				resource.NewDeployment("dep1", "test", time.Second).
-					WithStatus("success", nil),
-				resource.NewDeployment("dep2", "test", time.Second).
-					WithStatus("error", errors.New("could not return within default timeout")),
+				withStatus(
+					resource.NewDeployment("dep1", "test", time.Second),
+					"success",
+					nil,
+				),
+				withStatus(
+					resource.NewDeployment("dep2", "test", time.Second),
+					"error",
+					errors.New("could not return within default timeout"),
+				),
 			},
 			expectedErrMsg: []string{"dep2 failed due to could not return within default timeout"},
 			shouldErr:      true,
 		},
 		{
 			description: "no error",
 			deps: []*resource.Deployment{
-				resource.NewDeployment("dep1", "test", time.Second).
-					WithStatus("success", nil),
-				resource.NewDeployment("dep2", "test", time.Second).
-					WithStatus("running", nil),
+				withStatus(
+					resource.NewDeployment("dep1", "test", time.Second),
+					"success",
+					nil,
+				),
+				withStatus(resource.NewDeployment("dep2", "test", time.Second),
+					"running",
+					nil,
+				),
 			},
 		},
 		{
 			description: "multiple errors",
 			deps: []*resource.Deployment{
-				resource.NewDeployment("dep1", "test", time.Second).
-					WithStatus("success", nil),
-				resource.NewDeployment("dep2", "test", time.Second).
-					WithStatus("error", errors.New("could not return within default timeout")),
-				resource.NewDeployment("dep3", "test", time.Second).
-					WithStatus("error", errors.New("ERROR")),
+				withStatus(
+					resource.NewDeployment("dep1", "test", time.Second),
+					"success",
+					nil,
+				),
+				withStatus(
+					resource.NewDeployment("dep2", "test", time.Second),
+					"error",
+					errors.New("could not return within default timeout"),
+				),
+				withStatus(
+					resource.NewDeployment("dep3", "test", time.Second),
+					"error",
+					errors.New("ERROR"),
+				),
 			},
 			expectedErrMsg: []string{"dep2 failed due to could not return within default timeout",
 				"dep3 failed due to ERROR"},
@@ -385,10 +405,11 @@ func TestPrintSummaryStatus(t *testing.T) {
 		testutil.Run(t, test.description, func(t *testutil.T) {
 			out := new(bytes.Buffer)
 			printStatusCheckSummary(
-				resource.NewDeployment("dep", "test", 0).WithStatus("", test.err),
+				out,
+				withStatus(resource.NewDeployment("dep", "test", 0), "", test.err),
 				int(test.pending),
 				10,
-				out)
+			)
 			t.CheckDeepEqual(test.expected, out.String())
 		})
 	}
@@ -431,8 +452,11 @@ func TestPrintStatus(t *testing.T) {
 					"succes",
 					nil,
 				),
-				resource.NewDeployment("r2", "test", 1).
-					WithStatus("pending", nil),
+				withStatus(
+					resource.NewDeployment("r2", "test", 1),
+					"pending",
+					nil,
+				),
 			},
 			expectedOut: " - test:deployment/r2 pending\n",
 		},
@@ -444,8 +468,11 @@ func TestPrintStatus(t *testing.T) {
 					"succes",
 					nil,
 				),
-				resource.NewDeployment("r2", "test", 1).
-					WithStatus("", fmt.Errorf("context deadline expired")),
+				withStatus(
+					resource.NewDeployment("r2", "test", 1),
+					"",
+					fmt.Errorf("context deadline expired"),
+				),
 			},
 			expectedOut: " - test:deployment/r2 context deadline expired\n",
 		},
@@ -466,3 +493,8 @@ func withDone(d *resource.Deployment, details string, err error) *resource.Deplo
 	d.MarkDone()
 	return d
 }
+
+func withStatus(d *resource.Deployment, details string, err error) *resource.Deployment {
+	d.UpdateStatus(details, err)
+	return d
+}

pkg/skaffold/schema/latest/config.go

@@ -427,6 +427,9 @@ type KustomizeDeploy struct {
 
 	// Flags are additional flags passed to `kubectl`.
 	Flags KubectlFlags `yaml:"flags,omitempty"`
+
+	// BuildArgs are additional args passed to `kustomize build`.
+	BuildArgs []string `yaml:"buildArgs,omitempty"`
 }
 
 // HelmRelease describes a helm release to be deployed.

pkg/skaffold/schema/v1beta14/upgrade.go

@@ -25,6 +25,7 @@ import (
 // Upgrade upgrades a configuration to the next version.
 // Config changes from v1beta14 to v1beta15
 // 1. Additions:
+//    buildArgs for Kustomize deployer
 // 2. Removals:
 // 3. No updates
 func (config *SkaffoldConfig) Upgrade() (util.VersionedConfig, error) {