Enable skaffold debug for kustomize

docs/content/en/docs/how-tos/debug/_index.md

@@ -36,8 +36,8 @@ representations are untouched.
 
 `skaffold debug` has some limitations:
 
-  - Only the `kubectl` deployer is supported at the moment: the Helm and Kustomize
-    deployers are not yet available.
+  - Only the `kubectl` and `kustomize` deployers are supported at the moment: support for
+    the Helm deployer is not yet available.
   - Only JVM and NodeJS applications are supported:
       - JVM applications are configured using the `JAVA_TOOL_OPTIONS` environment variable
         which causes extra debugging output on launch.

integration/debug_test.go

@@ -0,0 +1,73 @@
+/*
+Copyright 2019 The Skaffold Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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.
+*/
+
+package integration
+
+import (
+	"testing"
+
+	"github.com/GoogleContainerTools/skaffold/integration/skaffold"
+)
+
+func TestDebug(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	tests := []struct {
+		description string
+		dir         string
+		filename    string
+		args        []string
+		deployments []string
+		pods        []string
+		env         []string
+		remoteOnly  bool
+	}{
+		{
+			description: "jib+kubectl",
+			dir:         "testdata/jib",
+			deployments: []string{"web"},
+		},
+		{
+			description: "jib+kustomize",
+			args:        []string{"--profile", "kustomize"},
+			dir:         "testdata/jib",
+			deployments: []string{"web"},
+		},
+	}
+	for _, test := range tests {
+		t.Run(test.description, func(t *testing.T) {
+			ns, client, deleteNs := SetupNamespace(t)
+			defer deleteNs()
+
+			stop := skaffold.Debug(test.args...).WithConfig(test.filename).InDir(test.dir).InNs(ns.Name).WithEnv(test.env).RunBackground(t)
+			defer stop()
+
+			client.WaitForPodsReady(test.pods...)
+			client.WaitForDeploymentsToStabilize(test.deployments...)
+			for _, depName := range test.deployments {
+				deploy := client.GetDeployment(depName)
+				annotations := deploy.Spec.Template.GetAnnotations()
+				if _, found := annotations["debug.cloud.google.com/config"]; !found {
+					t.Errorf("deployment missing debug annotation: %v", annotations)
+				}
+			}
+
+			skaffold.Delete().WithConfig(test.filename).InDir(test.dir).InNs(ns.Name).WithEnv(test.env).RunOrFail(t)
+		})
+	}
+}

integration/skaffold/helper.go

@@ -61,6 +61,11 @@ func Deploy(args ...string) *RunBuilder {
 	return &RunBuilder{command: "deploy", args: args}
 }
 
+// Debug runs `skaffold debug` with the given arguments.
+func Debug(args ...string) *RunBuilder {
+	return &RunBuilder{command: "debug", args: args}
+}
+
 // Run runs `skaffold run` with the given arguments.
 func Run(args ...string) *RunBuilder {
 	return &RunBuilder{command: "run", args: args}
@@ -172,7 +177,7 @@ func (b *RunBuilder) RunOrFailOutput(t *testing.T) []byte {
 	logrus.Infoln(cmd.Args)
 
 	start := time.Now()
-	out, err := cmd.Output()
+	out, err := cmd.CombinedOutput()
 	if err != nil {
 		t.Fatalf("skaffold %s: %v, %s", b.command, err, out)
 	}

integration/testdata/jib/kustomization.yaml

@@ -0,0 +1,2 @@
+resources:
+  - k8s/web.yaml

integration/testdata/jib/skaffold.yaml

@@ -12,3 +12,6 @@ profiles:
   - name: gcb
     build:
       googleCloudBuild: {}
+  - name: kustomize
+    deploy:
+      kustomize: {}

pkg/skaffold/deploy/kubectl.go

@@ -110,7 +110,7 @@ func (k *KubectlDeployer) Deploy(ctx context.Context, out io.Writer, builds []bu
 	for _, transform := range manifestTransforms {
 		manifests, err = transform(manifests, builds, k.insecureRegistries)
 		if err != nil {
-			return errors.Wrap(err, "debug transform of manifests")
+			return errors.Wrap(err, "unable to transform manifests")
 		}
 	}
 

pkg/skaffold/deploy/kustomize.go

@@ -63,8 +63,9 @@ type secretGenerator struct {
 type KustomizeDeployer struct {
 	*latest.KustomizeDeploy
 
-	kubectl     kubectl.CLI
-	defaultRepo string
+	kubectl            kubectl.CLI
+	defaultRepo        string
+	insecureRegistries map[string]bool
 }
 
 func NewKustomizeDeployer(runCtx *runcontext.RunContext) *KustomizeDeployer {
@@ -76,7 +77,8 @@ func NewKustomizeDeployer(runCtx *runcontext.RunContext) *KustomizeDeployer {
 			Flags:       runCtx.Cfg.Deploy.KustomizeDeploy.Flags,
 			ForceDeploy: runCtx.Opts.ForceDeploy(),
 		},
-		defaultRepo: runCtx.DefaultRepo,
+		defaultRepo:        runCtx.DefaultRepo,
+		insecureRegistries: runCtx.InsecureRegistries,
 	}
 }
 
@@ -118,6 +120,13 @@ func (k *KustomizeDeployer) Deploy(ctx context.Context, out io.Writer, builds []
 		return errors.Wrap(err, "setting labels in manifests")
 	}
 
+	for _, transform := range manifestTransforms {
+		manifests, err = transform(manifests, builds, k.insecureRegistries)
+		if err != nil {
+			return errors.Wrap(err, "unable to transform manifests")
+		}
+	}
+
 	err = k.kubectl.Apply(ctx, out, manifests)
 	if err != nil {
 		event.DeployFailed(err)