[v2] enable skafffold delete in kpt v2 deployer

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

Hide file tree

Showing 5 changed files with 59 additions and 5 deletions.
diff --git a/docs/content/en/schemas/v2beta20.json b/docs/content/en/schemas/v2beta20.json
@@ -956,6 +956,29 @@
       "description": "describes a dependency on another skaffold configuration.",
       "x-intellij-html-description": "describes a dependency on another skaffold configuration."
     },
+    "ContainerHook": {
+      "required": [
+        "command"
+      ],
+      "properties": {
+        "command": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array",
+          "description": "command to execute.",
+          "x-intellij-html-description": "command to execute.",
+          "default": "[]"
+        }
+      },
+      "preferredOrder": [
+        "command"
+      ],
+      "additionalProperties": false,
+      "type": "object",
+      "description": "describes a lifecycle hook definition to execute on a container. The container name is inferred from the scope in which this hook is defined.",
+      "x-intellij-html-description": "describes a lifecycle hook definition to execute on a container. The container name is inferred from the scope in which this hook is defined."
+    },
     "CustomArtifact": {
       "properties": {
         "buildCommand": {

diff --git a/docs/content/en/schemas/v2beta21.json b/docs/content/en/schemas/v2beta21.json
@@ -956,6 +956,29 @@
       "description": "describes a dependency on another skaffold configuration.",
       "x-intellij-html-description": "describes a dependency on another skaffold configuration."
     },
+    "ContainerHook": {
+      "required": [
+        "command"
+      ],
+      "properties": {
+        "command": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array",
+          "description": "command to execute.",
+          "x-intellij-html-description": "command to execute.",
+          "default": "[]"
+        }
+      },
+      "preferredOrder": [
+        "command"
+      ],
+      "additionalProperties": false,
+      "type": "object",
+      "description": "describes a lifecycle hook definition to execute on a container. The container name is inferred from the scope in which this hook is defined.",
+      "x-intellij-html-description": "describes a lifecycle hook definition to execute on a container. The container name is inferred from the scope in which this hook is defined."
+    },
     "CustomArtifact": {
       "properties": {
         "buildCommand": {
@@ -2537,6 +2560,11 @@
           "description": "additional flags passed to `kubectl`.",
           "x-intellij-html-description": "additional flags passed to <code>kubectl</code>."
         },
+        "hooks": {
+          "$ref": "#/definitions/DeployHooks",
+          "description": "describes a set of lifecycle hooks that are executed before and after every deploy.",
+          "x-intellij-html-description": "describes a set of lifecycle hooks that are executed before and after every deploy."
+        },
         "manifests": {
           "items": {
             "type": "string"
@@ -2560,7 +2588,8 @@
         "manifests",
         "remoteManifests",
         "flags",
-        "defaultNamespace"
+        "defaultNamespace",
+        "hooks"
       ],
       "additionalProperties": false,
       "type": "object",

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/latest/v1/config.go b/pkg/skaffold/schema/latest/v1/config.go
@@ -566,7 +566,7 @@ type KubectlDeploy struct {
 	DefaultNamespace *string `yaml:"defaultNamespace,omitempty"`
 
 	// LifecycleHooks describes a set of lifecycle hooks that are executed before and after every deploy.
-	LifecycleHooks DeployHooks `yaml:"-"`
+	LifecycleHooks DeployHooks `yaml:"hooks,omitempty"`
 }
 
 // KubectlFlags are additional flags passed on the command
@@ -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.

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.