[v2] enable skafffold delete in kpt v2 deployer

Also update v2beta20.
GoogleContainerTools · Aug 9, 2021 · f5f9364 · f5f9364
1 parent 8544d9a
commit f5f9364
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pkg/skaffold/deploy/v2/kpt/kpt.go b/pkg/skaffold/deploy/v2/kpt/kpt.go
@@ -286,7 +286,9 @@ func (k *Deployer) Cleanup(ctx context.Context, out io.Writer) error {
 	instrumentation.AddAttributesToCurrentSpanFromContext(ctx, map[string]string{
 		"DeployerType": deployerName,
 	})
-
+	if err := kptInitFunc(ctx, out, k); err != nil {
+		return err
+	}
 	cmd := exec.CommandContext(ctx, "kpt", k.kptArgs("live", "destroy", k.applyDir)...)
 	cmd.Stdout = out
 	cmd.Stderr = out

diff --git a/pkg/skaffold/schema/v2beta20/config.go b/pkg/skaffold/schema/v2beta20/config.go
@@ -1397,7 +1397,7 @@ type ContainerHook struct {
 // NamedContainerHook describes a lifecycle hook definition to execute on a named container.
 type NamedContainerHook struct {
 	// ContainerHook describes a lifecycle hook definition to execute on a container.
-	ContainerHook `yaml:",inline"`
+	ContainerHook `yaml:",inline" yamltags:"skipTrim"`
 	// PodName is the name of the pod to execute the command in.
 	PodName string `yaml:"podName" yamltags:"required"`
 	// ContainerName is the name of the container to execute the command in.