Repository: GoogleContainerTools/skaffold
Pull request #7314 (2022-04-15 18:31:27)

fix: set build concurrency correctly for multi-config projects
<!-- Thank you for your contribution! -->

<!-- Include if applicable: -->
Fixes: #7310 <!-- tracking issues that this PR will close -->
**Description**
<!-- Describe your changes here. The more detail, the easier the review! -->


<!--
Please be sure your PR includes unit tests - we don't merge code that brings down test coverage! 
Integration tests are sometimes an appropriate substitute. 
-->
This was earlier fixed in https://github.com/GoogleContainerTools/skaffold/pull/7182 but regressed due to a bad subsequent [commit](https://github.com/GoogleContainerTools/skaffold/pull/7182/commits/f8904bd6575a22bca86fa7bb4c078fe13d9ea3b2) and missing test case. Fixed here and added the test case.


Patch:
diff --git a/docs/content/en/docs/references/cli/_index.md b/docs/content/en/docs/references/cli/_index.md
index 96df66d32..5f3975da6 100644
--- a/docs/content/en/docs/references/cli/_index.md
+++ b/docs/content/en/docs/references/cli/_index.md
@@ -850,7 +850,7 @@ Options:
       --overwrite=false: Overwrite original config with fixed config
       --remote-cache-dir='': Specify the location of the git repositories cache (default $HOME/.skaffold/repos)
       --sync-remote-cache='missing': Controls how Skaffold manages the remote config cache (see `remote-cache-dir`). One of `always` (default), `missing`, or `never`. `always` syncs remote repositories to latest on access. `missing` only clones remote repositories if they do not exist locally. `never` means the user takes responsibility for updating remote repositories.
-      --version='skaffold/v3alpha2': Target schema version to upgrade to
+      --version='skaffold/v3alpha1': Target schema version to upgrade to
 
 Usage:
   skaffold fix [options]
diff --git a/integration/examples/bazel/skaffold.yaml b/integration/examples/bazel/skaffold.yaml
index 680d211f7..ccc0ec6a2 100644
--- a/integration/examples/bazel/skaffold.yaml
+++ b/integration/examples/bazel/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/buildpacks-java/skaffold.yaml b/integration/examples/buildpacks-java/skaffold.yaml
index 50eb6590e..83fdc6e8a 100644
--- a/integration/examples/buildpacks-java/skaffold.yaml
+++ b/integration/examples/buildpacks-java/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/buildpacks-node/skaffold.yaml b/integration/examples/buildpacks-node/skaffold.yaml
index c94f26304..0c232554e 100644
--- a/integration/examples/buildpacks-node/skaffold.yaml
+++ b/integration/examples/buildpacks-node/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/buildpacks-python/skaffold.yaml b/integration/examples/buildpacks-python/skaffold.yaml
index 226440077..5d4c943ee 100644
--- a/integration/examples/buildpacks-python/skaffold.yaml
+++ b/integration/examples/buildpacks-python/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/buildpacks/skaffold.yaml b/integration/examples/buildpacks/skaffold.yaml
index 625ad04f3..d2801584e 100644
--- a/integration/examples/buildpacks/skaffold.yaml
+++ b/integration/examples/buildpacks/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/cross-platform-builds/skaffold.yaml b/integration/examples/cross-platform-builds/skaffold.yaml
index b1b11dfa8..b9f503eb6 100644
--- a/integration/examples/cross-platform-builds/skaffold.yaml
+++ b/integration/examples/cross-platform-builds/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   platforms: ["linux/amd64"]
diff --git a/integration/examples/custom-buildx/skaffold.yaml b/integration/examples/custom-buildx/skaffold.yaml
index 0d165eb2d..5b6ce230b 100644
--- a/integration/examples/custom-buildx/skaffold.yaml
+++ b/integration/examples/custom-buildx/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   platforms: ["linux/amd64", "linux/arm64"]
diff --git a/integration/examples/custom/skaffold.yaml b/integration/examples/custom/skaffold.yaml
index cbbed33a0..0faa18053 100644
--- a/integration/examples/custom/skaffold.yaml
+++ b/integration/examples/custom/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/dev-journey-buildpacks/skaffold.yaml b/integration/examples/dev-journey-buildpacks/skaffold.yaml
index f4a5b1c63..a2d8ad578 100644
--- a/integration/examples/dev-journey-buildpacks/skaffold.yaml
+++ b/integration/examples/dev-journey-buildpacks/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/docker-deploy/skaffold.yaml b/integration/examples/docker-deploy/skaffold.yaml
index 845a65645..676bd7ee7 100644
--- a/integration/examples/docker-deploy/skaffold.yaml
+++ b/integration/examples/docker-deploy/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   local:
diff --git a/integration/examples/gcb-kaniko/skaffold.yaml b/integration/examples/gcb-kaniko/skaffold.yaml
index 2c878d87b..c2acc22ae 100644
--- a/integration/examples/gcb-kaniko/skaffold.yaml
+++ b/integration/examples/gcb-kaniko/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   googleCloudBuild:
diff --git a/integration/examples/generate-pipeline/skaffold.yaml b/integration/examples/generate-pipeline/skaffold.yaml
index a941929f2..1670ec3e3 100644
--- a/integration/examples/generate-pipeline/skaffold.yaml
+++ b/integration/examples/generate-pipeline/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/getting-started-kustomize/skaffold.yaml b/integration/examples/getting-started-kustomize/skaffold.yaml
index 7fcbd0ede..dd02586b7 100644
--- a/integration/examples/getting-started-kustomize/skaffold.yaml
+++ b/integration/examples/getting-started-kustomize/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 metadata:
   name: getting-started-kustomize
diff --git a/integration/examples/getting-started/skaffold.yaml b/integration/examples/getting-started/skaffold.yaml
index 9e577e7d3..ecca87e44 100644
--- a/integration/examples/getting-started/skaffold.yaml
+++ b/integration/examples/getting-started/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/google-cloud-build/skaffold.yaml b/integration/examples/google-cloud-build/skaffold.yaml
index a57808b63..818136d7c 100644
--- a/integration/examples/google-cloud-build/skaffold.yaml
+++ b/integration/examples/google-cloud-build/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   googleCloudBuild:
diff --git a/integration/examples/helm-deployment-dependencies/skaffold.yaml b/integration/examples/helm-deployment-dependencies/skaffold.yaml
index b15832054..739c19592 100644
--- a/integration/examples/helm-deployment-dependencies/skaffold.yaml
+++ b/integration/examples/helm-deployment-dependencies/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   tagPolicy:
diff --git a/integration/examples/helm-deployment/skaffold.yaml b/integration/examples/helm-deployment/skaffold.yaml
index 8080a849b..897d88caa 100644
--- a/integration/examples/helm-deployment/skaffold.yaml
+++ b/integration/examples/helm-deployment/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/helm-remote-repo/skaffold.yaml b/integration/examples/helm-remote-repo/skaffold.yaml
index b523aeff9..bf55d007d 100644
--- a/integration/examples/helm-remote-repo/skaffold.yaml
+++ b/integration/examples/helm-remote-repo/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 deploy:
   helm:
diff --git a/integration/examples/hot-reload/skaffold.yaml b/integration/examples/hot-reload/skaffold.yaml
index 0d29858af..0fbbf1fe6 100644
--- a/integration/examples/hot-reload/skaffold.yaml
+++ b/integration/examples/hot-reload/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/jib-gradle/skaffold.yaml b/integration/examples/jib-gradle/skaffold.yaml
index 4164f1447..8abc8d246 100644
--- a/integration/examples/jib-gradle/skaffold.yaml
+++ b/integration/examples/jib-gradle/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/jib-multimodule/skaffold.yaml b/integration/examples/jib-multimodule/skaffold.yaml
index a908fa52a..49c9e7a0b 100644
--- a/integration/examples/jib-multimodule/skaffold.yaml
+++ b/integration/examples/jib-multimodule/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/jib-sync/skaffold-gradle.yaml b/integration/examples/jib-sync/skaffold-gradle.yaml
index f413b89cb..650efbafc 100644
--- a/integration/examples/jib-sync/skaffold-gradle.yaml
+++ b/integration/examples/jib-sync/skaffold-gradle.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/jib-sync/skaffold-maven.yaml b/integration/examples/jib-sync/skaffold-maven.yaml
index 1cdebf1d4..4e48f1a9e 100644
--- a/integration/examples/jib-sync/skaffold-maven.yaml
+++ b/integration/examples/jib-sync/skaffold-maven.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/jib/skaffold.yaml b/integration/examples/jib/skaffold.yaml
index 5fafae262..bf844319d 100644
--- a/integration/examples/jib/skaffold.yaml
+++ b/integration/examples/jib/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/kaniko/skaffold.yaml b/integration/examples/kaniko/skaffold.yaml
index 61e9aac91..5f0dcc102 100644
--- a/integration/examples/kaniko/skaffold.yaml
+++ b/integration/examples/kaniko/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/ko/skaffold.yaml b/integration/examples/ko/skaffold.yaml
index 2c0a86213..f4e3ac231 100644
--- a/integration/examples/ko/skaffold.yaml
+++ b/integration/examples/ko/skaffold.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/kustomize/skaffold-kustomize-args.yaml b/integration/examples/kustomize/skaffold-kustomize-args.yaml
index 550e214f6..b079032df 100644
--- a/integration/examples/kustomize/skaffold-kustomize-args.yaml
+++ b/integration/examples/kustomize/skaffold-kustomize-args.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 deploy:
   kustomize:
diff --git a/integration/examples/kustomize/skaffold.yaml b/integration/examples/kustomize/skaffold.yaml
index 1cf52a9b3..680fe4343 100644
--- a/integration/examples/kustomize/skaffold.yaml
+++ b/integration/examples/kustomize/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 deploy:
   kustomize: {}
diff --git a/integration/examples/lifecycle-hooks/skaffold.yaml b/integration/examples/lifecycle-hooks/skaffold.yaml
index 77465f0fe..a604e04bc 100644
--- a/integration/examples/lifecycle-hooks/skaffold.yaml
+++ b/integration/examples/lifecycle-hooks/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/microservices/skaffold.yaml b/integration/examples/microservices/skaffold.yaml
index 28efeac4c..5ab4343af 100644
--- a/integration/examples/microservices/skaffold.yaml
+++ b/integration/examples/microservices/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/multi-config-microservices/base/skaffold.yaml b/integration/examples/multi-config-microservices/base/skaffold.yaml
index 113968e35..25c53cf62 100644
--- a/integration/examples/multi-config-microservices/base/skaffold.yaml
+++ b/integration/examples/multi-config-microservices/base/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/multi-config-microservices/leeroy-app/skaffold.yaml b/integration/examples/multi-config-microservices/leeroy-app/skaffold.yaml
index 3b67cdd73..1a520d923 100644
--- a/integration/examples/multi-config-microservices/leeroy-app/skaffold.yaml
+++ b/integration/examples/multi-config-microservices/leeroy-app/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 metadata:
   name: app-config
diff --git a/integration/examples/multi-config-microservices/leeroy-web/skaffold.yaml b/integration/examples/multi-config-microservices/leeroy-web/skaffold.yaml
index bc5e23f56..6e817586d 100644
--- a/integration/examples/multi-config-microservices/leeroy-web/skaffold.yaml
+++ b/integration/examples/multi-config-microservices/leeroy-web/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 metadata:
   name: web-config
diff --git a/integration/examples/multi-config-microservices/skaffold.yaml b/integration/examples/multi-config-microservices/skaffold.yaml
index 90635857f..4b590c7c3 100644
--- a/integration/examples/multi-config-microservices/skaffold.yaml
+++ b/integration/examples/multi-config-microservices/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 requires:
 - path: ./leeroy-app
diff --git a/integration/examples/nodejs/skaffold.yaml b/integration/examples/nodejs/skaffold.yaml
index 904435871..33801eb83 100644
--- a/integration/examples/nodejs/skaffold.yaml
+++ b/integration/examples/nodejs/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 
 build:
diff --git a/integration/examples/profile-patches/skaffold.yaml b/integration/examples/profile-patches/skaffold.yaml
index 741bc8ee6..96d8bf0a0 100644
--- a/integration/examples/profile-patches/skaffold.yaml
+++ b/integration/examples/profile-patches/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   # only build and deploy "base-service" on main profile
diff --git a/integration/examples/profiles/skaffold.yaml b/integration/examples/profiles/skaffold.yaml
index 52c951600..106d92a87 100644
--- a/integration/examples/profiles/skaffold.yaml
+++ b/integration/examples/profiles/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   # only build and deploy "world-service" on main profile
diff --git a/integration/examples/react-reload-docker/skaffold.yaml b/integration/examples/react-reload-docker/skaffold.yaml
index 0ac059ff1..ad8a48847 100644
--- a/integration/examples/react-reload-docker/skaffold.yaml
+++ b/integration/examples/react-reload-docker/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   local:
diff --git a/integration/examples/react-reload/skaffold.yaml b/integration/examples/react-reload/skaffold.yaml
index fba20e64a..05cc623bf 100644
--- a/integration/examples/react-reload/skaffold.yaml
+++ b/integration/examples/react-reload/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/remote-multi-config-microservices/skaffold.yaml b/integration/examples/remote-multi-config-microservices/skaffold.yaml
index 3d1436d57..813e63ee7 100644
--- a/integration/examples/remote-multi-config-microservices/skaffold.yaml
+++ b/integration/examples/remote-multi-config-microservices/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 requires:
 - git:
diff --git a/integration/examples/ruby/skaffold.yaml b/integration/examples/ruby/skaffold.yaml
index 4be3f031a..ec3438427 100644
--- a/integration/examples/ruby/skaffold.yaml
+++ b/integration/examples/ruby/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/simple-artifact-dependency/skaffold.yaml b/integration/examples/simple-artifact-dependency/skaffold.yaml
index 4af9f41dc..87a8f585d 100644
--- a/integration/examples/simple-artifact-dependency/skaffold.yaml
+++ b/integration/examples/simple-artifact-dependency/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/tagging-with-environment-variables/skaffold.yaml b/integration/examples/tagging-with-environment-variables/skaffold.yaml
index 708bd69c7..299055d0b 100644
--- a/integration/examples/tagging-with-environment-variables/skaffold.yaml
+++ b/integration/examples/tagging-with-environment-variables/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/templated-fields/skaffold.yaml b/integration/examples/templated-fields/skaffold.yaml
index aa94bc5d0..2a6b2a9ea 100644
--- a/integration/examples/templated-fields/skaffold.yaml
+++ b/integration/examples/templated-fields/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 metadata:
   name: my-app
diff --git a/integration/examples/typescript/skaffold.yaml b/integration/examples/typescript/skaffold.yaml
index de8c457c8..936650c08 100644
--- a/integration/examples/typescript/skaffold.yaml
+++ b/integration/examples/typescript/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 
 build:
diff --git a/pkg/skaffold/build/builder_mux.go b/pkg/skaffold/build/builder_mux.go
index cb9722203..788c201a1 100644
--- a/pkg/skaffold/build/builder_mux.go
+++ b/pkg/skaffold/build/builder_mux.go
@@ -150,10 +150,11 @@ func getConcurrency(pbs []PipelineBuilder, cliConcurrency int) int {
 	}
 	minConcurrency := -1
 	for i, b := range pbs {
-		concurrency := 1
-		if b.Concurrency() != nil {
-			concurrency = *b.Concurrency()
+		if b.Concurrency() == nil {
+			continue
 		}
+		concurrency := *b.Concurrency()
+
 		// set mux concurrency to be the minimum of all builders' concurrency. (concurrency = 0 means unlimited)
 		switch {
 		case minConcurrency < 0:
diff --git a/pkg/skaffold/instrumentation/export.go b/pkg/skaffold/instrumentation/export.go
index c86b11fb6..45c0de94b 100644
--- a/pkg/skaffold/instrumentation/export.go
+++ b/pkg/skaffold/instrumentation/export.go
@@ -178,6 +178,7 @@ func createMetrics(ctx context.Context, meter skaffoldMeter) {
 		attribute.String("error", meter.ErrorCode.String()),
 		attribute.String("platform_type", meter.PlatformType),
 		attribute.String("config_count", strconv.Itoa(meter.ConfigCount)),
+		attribute.String("cluster_type", meter.ClusterType),
 	}
 	sharedLabels := []attribute.KeyValue{
 		randLabel,
diff --git a/pkg/skaffold/schema/v3alpha1/config.go b/pkg/skaffold/schema/v3alpha1/config.go
deleted file mode 100644
index 1fc1e4d2e..000000000
--- a/pkg/skaffold/schema/v3alpha1/config.go
+++ /dev/null
@@ -1,1646 +0,0 @@
-/*
-Copyright 2021 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 v3alpha1
-
-import (
-	"encoding/json"
-
-	v1 "k8s.io/api/core/v1"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
-)
-
-const Version string = "skaffold/v3alpha1"
-
-// NewSkaffoldConfig creates a SkaffoldConfig
-func NewSkaffoldConfig() util.VersionedConfig {
-	return new(SkaffoldConfig)
-}
-
-func (c *SkaffoldConfig) GetVersion() string {
-	return c.APIVersion
-}
-
-// SkaffoldConfig holds the fields parsed from the Skaffold configuration file (skaffold.yaml).
-type SkaffoldConfig struct {
-	// APIVersion is the version of the configuration.
-	APIVersion string `yaml:"apiVersion" yamltags:"required"`
-
-	// Kind is always `Config`. Defaults to `Config`.
-	Kind string `yaml:"kind" yamltags:"required"`
-
-	// Metadata holds additional information about the config.
-	Metadata Metadata `yaml:"metadata,omitempty"`
-
-	// Dependencies describes a list of other required configs for the current config.
-	Dependencies []ConfigDependency `yaml:"requires,omitempty"`
-
-	// Pipeline defines the Build/Test/Deploy phases.
-	Pipeline `yaml:",inline"`
-
-	// Profiles *beta* can override be used to `build`, `test` or `deploy` configuration.
-	Profiles []Profile `yaml:"profiles,omitempty"`
-}
-
-// Metadata holds an optional name of the project.
-type Metadata struct {
-	// Name is an identifier for the project.
-	Name string `yaml:"name,omitempty"`
-}
-
-// Pipeline describes a Skaffold pipeline.
-type Pipeline struct {
-	// Build describes how images are built.
-	Build BuildConfig `yaml:"build,omitempty"`
-
-	// Test describes how images are tested.
-	Test []*TestCase `yaml:"test,omitempty"`
-
-	// Render describes how the original manifests are hydrated, validated and transformed.
-	Render RenderConfig `yaml:"manifests,omitempty"`
-
-	// Deploy describes how the manifests are deployed.
-	Deploy DeployConfig `yaml:"deploy,omitempty"`
-
-	// PortForward describes user defined resources to port-forward.
-	PortForward []*PortForwardResource `yaml:"portForward,omitempty"`
-}
-
-// GitInfo contains information on the origin of skaffold configurations cloned from a git repository.
-type GitInfo struct {
-	// Repo is the git repository the package should be cloned from.  e.g. `https://github.com/GoogleContainerTools/skaffold.git`.
-	Repo string `yaml:"repo" yamltags:"required"`
-
-	// Path is the relative path from the repo root to the skaffold configuration file. eg. `getting-started/skaffold.yaml`.
-	Path string `yaml:"path,omitempty"`
-
-	// Ref is the git ref the package should be cloned from. eg. `master` or `main`.
-	Ref string `yaml:"ref,omitempty"`
-
-	// Sync when set to `true` will reset the cached repository to the latest commit from remote on every run. To use the cached repository with uncommitted changes or unpushed commits, it needs to be set to `false`.
-	Sync *bool `yaml:"sync,omitempty"`
-}
-
-// ConfigDependency describes a dependency on another skaffold configuration.
-type ConfigDependency struct {
-	// Names includes specific named configs within the file path. If empty, then all configs in the file are included.
-	Names []string `yaml:"configs,omitempty"`
-
-	// Path describes the path to the file containing the required configs.
-	Path string `yaml:"path,omitempty" skaffold:"filepath" yamltags:"oneOf=paths"`
-
-	// GitRepo describes a remote git repository containing the required configs.
-	GitRepo *GitInfo `yaml:"git,omitempty" yamltags:"oneOf=paths"`
-
-	// ActiveProfiles describes the list of profiles to activate when resolving the required configs. These profiles must exist in the imported config.
-	ActiveProfiles []ProfileDependency `yaml:"activeProfiles,omitempty"`
-}
-
-// ProfileDependency describes a mapping from referenced config profiles to the current config profiles.
-// If the current config is activated with a profile in this mapping then the dependency configs are also activated with the corresponding mapped profiles.
-type ProfileDependency struct {
-	// Name describes name of the profile to activate in the dependency config. It should exist in the dependency config.
-	Name string `yaml:"name" yamltags:"required"`
-
-	// ActivatedBy describes a list of profiles in the current config that when activated will also activate the named profile in the dependency config. If empty then the named profile is always activated.
-	ActivatedBy []string `yaml:"activatedBy,omitempty"`
-}
-
-// ResourceType describes the Kubernetes resource types used for port forwarding.
-type ResourceType string
-
-// PortForwardResource describes a resource to port forward.
-type PortForwardResource struct {
-	// Type is the Kubernetes type that should be port forwarded.
-	// Acceptable resource types include: `Service`, `Pod` and Controller resource type that has a pod spec: `ReplicaSet`, `ReplicationController`, `Deployment`, `StatefulSet`, `DaemonSet`, `Job`, `CronJob`.
-	Type ResourceType `yaml:"resourceType,omitempty"`
-
-	// Name is the name of the Kubernetes resource to port forward.
-	Name string `yaml:"resourceName,omitempty"`
-
-	// Namespace is the namespace of the resource to port forward.
-	Namespace string `yaml:"namespace,omitempty"`
-
-	// Port is the resource port that will be forwarded.
-	Port util.IntOrString `yaml:"port,omitempty"`
-
-	// Address is the local address to bind to. Defaults to the loopback address 127.0.0.1.
-	Address string `yaml:"address,omitempty"`
-
-	// LocalPort is the local port to forward to. If the port is unavailable, Skaffold will choose a random open port to forward to. *Optional*.
-	LocalPort int `yaml:"localPort,omitempty"`
-}
-
-// BuildConfig contains all the configuration for the build steps.
-type BuildConfig struct {
-	// Artifacts lists the images you're going to be building.
-	Artifacts []*Artifact `yaml:"artifacts,omitempty"`
-
-	// InsecureRegistries is a list of registries declared by the user to be insecure.
-	// These registries will be connected to via HTTP instead of HTTPS.
-	InsecureRegistries []string `yaml:"insecureRegistries,omitempty"`
-
-	// TagPolicy *beta* determines how images are tagged.
-	// A few strategies are provided here, although you most likely won't need to care!
-	// If not specified, it defaults to `gitCommit: {variant: Tags}`.
-	TagPolicy TagPolicy `yaml:"tagPolicy,omitempty"`
-
-	BuildType `yaml:",inline"`
-}
-
-// TagPolicy contains all the configuration for the tagging step.
-type TagPolicy struct {
-	// GitTagger *beta* tags images with the git tag or commit of the artifact's workspace.
-	GitTagger *GitTagger `yaml:"gitCommit,omitempty" yamltags:"oneOf=tag"`
-
-	// ShaTagger *beta* tags images with their sha256 digest.
-	ShaTagger *ShaTagger `yaml:"sha256,omitempty" yamltags:"oneOf=tag"`
-
-	// EnvTemplateTagger *beta* tags images with a configurable template string.
-	EnvTemplateTagger *EnvTemplateTagger `yaml:"envTemplate,omitempty" yamltags:"oneOf=tag"`
-
-	// DateTimeTagger *beta* tags images with the build timestamp.
-	DateTimeTagger *DateTimeTagger `yaml:"dateTime,omitempty" yamltags:"oneOf=tag"`
-
-	// CustomTemplateTagger *beta* tags images with a configurable template string *composed of other taggers*.
-	CustomTemplateTagger *CustomTemplateTagger `yaml:"customTemplate,omitempty" yamltags:"oneOf=tag"`
-
-	// InputDigest *beta* tags images with their sha256 digest of their content.
-	InputDigest *InputDigest `yaml:"inputDigest,omitempty" yamltags:"oneOf=tag"`
-}
-
-// ShaTagger *beta* tags images with their sha256 digest.
-type ShaTagger struct{}
-
-// InputDigest *beta* tags hashes the image content.
-type InputDigest struct{}
-
-// GitTagger *beta* tags images with the git tag or commit of the artifact's workspace.
-type GitTagger struct {
-	// Variant determines the behavior of the git tagger. Valid variants are:
-	// `Tags` (default): use git tags or fall back to abbreviated commit hash.
-	// `CommitSha`: use the full git commit sha.
-	// `AbbrevCommitSha`: use the abbreviated git commit sha.
-	// `TreeSha`: use the full tree hash of the artifact workingdir.
-	// `AbbrevTreeSha`: use the abbreviated tree hash of the artifact workingdir.
-	Variant string `yaml:"variant,omitempty"`
-
-	// Prefix adds a fixed prefix to the tag.
-	Prefix string `yaml:"prefix,omitempty"`
-
-	// IgnoreChanges specifies whether to omit the `-dirty` postfix if there are uncommitted changes.
-	IgnoreChanges bool `yaml:"ignoreChanges,omitempty"`
-}
-
-// EnvTemplateTagger *beta* tags images with a configurable template string.
-type EnvTemplateTagger struct {
-	// Template used to produce the image name and tag.
-	// See golang [text/template](https://golang.org/pkg/text/template/).
-	// The template is executed against the current environment,
-	// with those variables injected.
-	// For example: `{{.RELEASE}}`.
-	Template string `yaml:"template,omitempty" yamltags:"required"`
-}
-
-// DateTimeTagger *beta* tags images with the build timestamp.
-type DateTimeTagger struct {
-	// Format formats the date and time.
-	// See [#Time.Format](https://golang.org/pkg/time/#Time.Format).
-	// Defaults to `2006-01-02_15-04-05.999_MST`.
-	Format string `yaml:"format,omitempty"`
-
-	// TimeZone sets the timezone for the date and time.
-	// See [Time.LoadLocation](https://golang.org/pkg/time/#Time.LoadLocation).
-	// Defaults to the local timezone.
-	TimeZone string `yaml:"timezone,omitempty"`
-}
-
-// CustomTemplateTagger *beta* tags images with a configurable template string.
-type CustomTemplateTagger struct {
-	// Template used to produce the image name and tag.
-	// See golang [text/template](https://golang.org/pkg/text/template/).
-	// The template is executed against the provided components with those variables injected.
-	// For example: `{{.DATE}}` where DATE references a TaggerComponent.
-	Template string `yaml:"template,omitempty" yamltags:"required"`
-
-	// Components lists TaggerComponents that the template (see field above) can be executed against.
-	Components []TaggerComponent `yaml:"components,omitempty"`
-}
-
-// TaggerComponent *beta* is a component of CustomTemplateTagger.
-type TaggerComponent struct {
-	// Name is an identifier for the component.
-	Name string `yaml:"name,omitempty"`
-
-	// Component is a tagging strategy to be used in CustomTemplateTagger.
-	Component TagPolicy `yaml:",inline" yamltags:"skipTrim"`
-}
-
-// BuildType contains the specific implementation and parameters needed
-// for the build step. Only one field should be populated.
-type BuildType struct {
-	// LocalBuild *beta* describes how to do a build on the local docker daemon
-	// and optionally push to a repository.
-	LocalBuild *LocalBuild `yaml:"local,omitempty" yamltags:"oneOf=build"`
-
-	// GoogleCloudBuild *beta* describes how to do a remote build on
-	// [Google Cloud Build](https://cloud.google.com/cloud-build/).
-	GoogleCloudBuild *GoogleCloudBuild `yaml:"googleCloudBuild,omitempty" yamltags:"oneOf=build"`
-
-	// Cluster *beta* describes how to do an on-cluster build.
-	Cluster *ClusterDetails `yaml:"cluster,omitempty" yamltags:"oneOf=build"`
-}
-
-// LocalBuild *beta* describes how to do a build on the local docker daemon
-// and optionally push to a repository.
-type LocalBuild struct {
-	// Push should images be pushed to a registry.
-	// If not specified, images are pushed only if the current Kubernetes context
-	// connects to a remote cluster.
-	Push *bool `yaml:"push,omitempty"`
-
-	// TryImportMissing whether to attempt to import artifacts from
-	// Docker (either a local or remote registry) if not in the cache.
-	TryImportMissing bool `yaml:"tryImportMissing,omitempty"`
-
-	// UseDockerCLI use `docker` command-line interface instead of Docker Engine APIs.
-	UseDockerCLI bool `yaml:"useDockerCLI,omitempty"`
-
-	// UseBuildkit use BuildKit to build Docker images. If unspecified, uses the Docker default.
-	UseBuildkit *bool `yaml:"useBuildkit,omitempty"`
-
-	// Concurrency is how many artifacts can be built concurrently. 0 means "no-limit".
-	// Defaults to `1`.
-	Concurrency *int `yaml:"concurrency,omitempty"`
-}
-
-// GoogleCloudBuild *beta* describes how to do a remote build on
-// [Google Cloud Build](https://cloud.google.com/cloud-build/docs/).
-// Docker and Jib artifacts can be built on Cloud Build. The `projectId` needs
-// to be provided and the currently logged in user should be given permissions to trigger
-// new builds.
-type GoogleCloudBuild struct {
-	// ProjectID is the ID of your Cloud Platform Project.
-	// If it is not provided, Skaffold will guess it from the image name.
-	// For example, given the artifact image name `gcr.io/myproject/image`, Skaffold
-	// will use the `myproject` GCP project.
-	ProjectID string `yaml:"projectId,omitempty"`
-
-	// DiskSizeGb is the disk size of the VM that runs the build.
-	// See [Cloud Build Reference](https://cloud.google.com/cloud-build/docs/api/reference/rest/v1/projects.builds#buildoptions).
-	DiskSizeGb int64 `yaml:"diskSizeGb,omitempty"`
-
-	// MachineType is the type of the VM that runs the build.
-	// See [Cloud Build Reference](https://cloud.google.com/cloud-build/docs/api/reference/rest/v1/projects.builds#buildoptions).
-	MachineType string `yaml:"machineType,omitempty"`
-
-	// Timeout is the amount of time (in seconds) that this build should be allowed to run.
-	// See [Cloud Build Reference](https://cloud.google.com/cloud-build/docs/api/reference/rest/v1/projects.builds#resource-build).
-	Timeout string `yaml:"timeout,omitempty"`
-
-	// Logging specifies the logging mode.
-	// Valid modes are:
-	// `LOGGING_UNSPECIFIED`: The service determines the logging mode.
-	// `LEGACY`: Stackdriver logging and Cloud Storage logging are enabled (default).
-	// `GCS_ONLY`: Only Cloud Storage logging is enabled.
-	// See [Cloud Build Reference](https://cloud.google.com/cloud-build/docs/api/reference/rest/v1/projects.builds#loggingmode).
-	Logging string `yaml:"logging,omitempty"`
-
-	// LogStreamingOption specifies the behavior when writing build logs to Google Cloud Storage.
-	// Valid options are:
-	// `STREAM_DEFAULT`: Service may automatically determine build log streaming behavior.
-	// `STREAM_ON`:  Build logs should be streamed to Google Cloud Storage.
-	// `STREAM_OFF`: Build logs should not be streamed to Google Cloud Storage; they will be written when the build is completed.
-	// See [Cloud Build Reference](https://cloud.google.com/cloud-build/docs/api/reference/rest/v1/projects.builds#logstreamingoption).
-	LogStreamingOption string `yaml:"logStreamingOption,omitempty"`
-
-	// DockerImage is the image that runs a Docker build.
-	// See [Cloud Builders](https://cloud.google.com/cloud-build/docs/cloud-builders).
-	// Defaults to `gcr.io/cloud-builders/docker`.
-	DockerImage string `yaml:"dockerImage,omitempty"`
-
-	// KanikoImage is the image that runs a Kaniko build.
-	// See [Cloud Builders](https://cloud.google.com/cloud-build/docs/cloud-builders).
-	// Defaults to `gcr.io/kaniko-project/executor`.
-	KanikoImage string `yaml:"kanikoImage,omitempty"`
-
-	// MavenImage is the image that runs a Maven build.
-	// See [Cloud Builders](https://cloud.google.com/cloud-build/docs/cloud-builders).
-	// Defaults to `gcr.io/cloud-builders/mvn`.
-	MavenImage string `yaml:"mavenImage,omitempty"`
-
-	// GradleImage is the image that runs a Gradle build.
-	// See [Cloud Builders](https://cloud.google.com/cloud-build/docs/cloud-builders).
-	// Defaults to `gcr.io/cloud-builders/gradle`.
-	GradleImage string `yaml:"gradleImage,omitempty"`
-
-	// PackImage is the image that runs a Cloud Native Buildpacks build.
-	// See [Cloud Builders](https://cloud.google.com/cloud-build/docs/cloud-builders).
-	// Defaults to `gcr.io/k8s-skaffold/pack`.
-	PackImage string `yaml:"packImage,omitempty"`
-
-	// Concurrency is how many artifacts can be built concurrently. 0 means "no-limit".
-	// Defaults to `0`.
-	Concurrency int `yaml:"concurrency,omitempty"`
-
-	// WorkerPool configures a pool of workers to run the build.
-	WorkerPool string `yaml:"workerPool,omitempty"`
-}
-
-// KanikoCache configures Kaniko caching. If a cache is specified, Kaniko will
-// use a remote cache which will speed up builds.
-type KanikoCache struct {
-	// Repo is a remote repository to store cached layers. If none is specified, one will be
-	// inferred from the image name. See [Kaniko Caching](https://github.com/GoogleContainerTools/kaniko#caching).
-	Repo string `yaml:"repo,omitempty"`
-	// HostPath specifies a path on the host that is mounted to each pod as read only cache volume containing base images.
-	// If set, must exist on each node and prepopulated with kaniko-warmer.
-	HostPath string `yaml:"hostPath,omitempty"`
-	// TTL Cache timeout in hours.
-	TTL string `yaml:"ttl,omitempty"`
-}
-
-// ClusterDetails *beta* describes how to do an on-cluster build.
-type ClusterDetails struct {
-	// HTTPProxy for kaniko pod.
-	HTTPProxy string `yaml:"HTTP_PROXY,omitempty"`
-
-	// HTTPSProxy for kaniko pod.
-	HTTPSProxy string `yaml:"HTTPS_PROXY,omitempty"`
-
-	// PullSecretPath is the path to the Google Cloud service account secret key file.
-	PullSecretPath string `yaml:"pullSecretPath,omitempty"`
-
-	// PullSecretName is the name of the Kubernetes secret for pulling base images
-	// and pushing the final image. If given, the secret needs to contain the Google Cloud
-	// service account secret key under the key `kaniko-secret`.
-	// Defaults to `kaniko-secret`.
-	PullSecretName string `yaml:"pullSecretName,omitempty"`
-
-	// PullSecretMountPath is the path the pull secret will be mounted at within the running container.
-	PullSecretMountPath string `yaml:"pullSecretMountPath,omitempty"`
-
-	// Namespace is the Kubernetes namespace.
-	// Defaults to current namespace in Kubernetes configuration.
-	Namespace string `yaml:"namespace,omitempty"`
-
-	// Timeout is the amount of time (in seconds) that this build is allowed to run.
-	// Defaults to 20 minutes (`20m`).
-	Timeout string `yaml:"timeout,omitempty"`
-
-	// DockerConfig describes how to mount the local Docker configuration into a pod.
-	DockerConfig *DockerConfig `yaml:"dockerConfig,omitempty"`
-
-	// ServiceAccountName describes the Kubernetes service account to use for the pod.
-	// Defaults to 'default'.
-	ServiceAccountName string `yaml:"serviceAccount,omitempty"`
-
-	// Tolerations describes the Kubernetes tolerations for the pod.
-	Tolerations []v1.Toleration `yaml:"tolerations,omitempty"`
-
-	// NodeSelector describes the Kubernetes node selector for the pod.
-	NodeSelector map[string]string `yaml:"nodeSelector,omitempty"`
-
-	// Annotations describes the Kubernetes annotations for the pod.
-	Annotations map[string]string `yaml:"annotations,omitempty"`
-
-	// RunAsUser defines the UID to request for running the container.
-	// If omitted, no SecurityContext will be specified for the pod and will therefore be inherited
-	// from the service account.
-	RunAsUser *int64 `yaml:"runAsUser,omitempty"`
-
-	// Resources define the resource requirements for the kaniko pod.
-	Resources *ResourceRequirements `yaml:"resources,omitempty"`
-
-	// Concurrency is how many artifacts can be built concurrently. 0 means "no-limit".
-	// Defaults to `0`.
-	Concurrency int `yaml:"concurrency,omitempty"`
-
-	// Volumes defines container mounts for ConfigMap and Secret resources.
-	Volumes []v1.Volume `yaml:"volumes,omitempty"`
-
-	// RandomPullSecret adds a random UUID postfix to the default name of the pull secret to facilitate parallel builds, e.g. kaniko-secretdocker-cfgfd154022-c761-416f-8eb3-cf8258450b85.
-	RandomPullSecret bool `yaml:"randomPullSecret,omitempty"`
-
-	// RandomDockerConfigSecret adds a random UUID postfix to the default name of the docker secret to facilitate parallel builds, e.g. docker-cfgfd154022-c761-416f-8eb3-cf8258450b85.
-	RandomDockerConfigSecret bool `yaml:"randomDockerConfigSecret,omitempty"`
-}
-
-// DockerConfig contains information about the docker `config.json` to mount.
-type DockerConfig struct {
-	// Path is the path to the docker `config.json`.
-	Path string `yaml:"path,omitempty"`
-
-	// SecretName is the Kubernetes secret that contains the `config.json` Docker configuration.
-	// Note that the expected secret type is not 'kubernetes.io/dockerconfigjson' but 'Opaque'.
-	SecretName string `yaml:"secretName,omitempty"`
-}
-
-// ResourceRequirements describes the resource requirements for the kaniko pod.
-type ResourceRequirements struct {
-	// Requests [resource requests](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#resource-requests-and-limits-of-pod-and-container) for the Kaniko pod.
-	Requests *ResourceRequirement `yaml:"requests,omitempty"`
-
-	// Limits [resource limits](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#resource-requests-and-limits-of-pod-and-container) for the Kaniko pod.
-	Limits *ResourceRequirement `yaml:"limits,omitempty"`
-}
-
-// ResourceRequirement stores the CPU/Memory requirements for the pod.
-type ResourceRequirement struct {
-	// CPU the number cores to be used.
-	// For example: `2`, `2.0` or `200m`.
-	CPU string `yaml:"cpu,omitempty"`
-
-	// Memory the amount of memory to allocate to the pod.
-	// For example: `1Gi` or `1000Mi`.
-	Memory string `yaml:"memory,omitempty"`
-
-	// EphemeralStorage the amount of Ephemeral storage to allocate to the pod.
-	// For example: `1Gi` or `1000Mi`.
-	EphemeralStorage string `yaml:"ephemeralStorage,omitempty"`
-
-	// ResourceStorage the amount of resource storage to allocate to the pod.
-	// For example: `1Gi` or `1000Mi`.
-	ResourceStorage string `yaml:"resourceStorage,omitempty"`
-}
-
-// TestCase is a list of tests to run on images that Skaffold builds.
-type TestCase struct {
-	// ImageName is the artifact on which to run those tests.
-	// For example: `gcr.io/k8s-skaffold/example`.
-	ImageName string `yaml:"image" yamltags:"required"`
-
-	// Workspace is the directory containing the test sources.
-	// Defaults to `.`.
-	Workspace string `yaml:"context,omitempty" skaffold:"filepath"`
-
-	// CustomTests lists the set of custom tests to run after an artifact is built.
-	CustomTests []CustomTest `yaml:"custom,omitempty"`
-
-	// StructureTests lists the [Container Structure Tests](https://github.com/GoogleContainerTools/container-structure-test)
-	// to run on that artifact.
-	// For example: `["./test/*"]`.
-	StructureTests []string `yaml:"structureTests,omitempty" skaffold:"filepath"`
-
-	// StructureTestArgs lists additional configuration arguments passed to `container-structure-test` binary.
-	// For example: `["--driver=tar", "--no-color", "-q"]`.
-	StructureTestArgs []string `yaml:"structureTestsArgs,omitempty"`
-}
-
-// RenderConfig contains all the configuration needed by the render steps.
-type RenderConfig struct {
-
-	// Generate defines the dry manifests from a variety of sources.
-	Generate `yaml:",inline"`
-
-	// Transform defines a set of transformation operations to run in series
-	Transform *[]Transformer `yaml:"transform,omitempty"`
-
-	// Validate defines a set of validator operations to run in series.
-	Validate *[]Validator `yaml:"validate,omitempty"`
-
-	// Output is the path to the hydrated directory.
-	Output string `yaml:"output,omitempty"`
-}
-
-// Generate defines the dry manifests from a variety of sources.
-type Generate struct {
-	RawK8s    []string `yaml:"rawYaml,omitempty" skaffold:"filepath"`
-	Kustomize []string `yaml:"kustomize,omitempty" skaffold:"filepath"`
-	Helm      *Helm    `yaml:"helm,omitempty"`
-	Kpt       []string `yaml:"kpt,omitempty" skaffold:"filepath"`
-}
-
-type Helm struct {
-	Releases *[]HelmRelease `yaml:"releases,omitempty"`
-	// Flags are additional option flags that are passed on the command
-	// line to `helm`.
-	Flags HelmDeployFlags `yaml:"flags,omitempty"`
-}
-
-// Transformer describes the supported kpt transformers.
-type Transformer struct {
-	// Name is the transformer name. Can only accept skaffold whitelisted tools.
-	Name string `yaml:"name" yamltags:"required"`
-	// ConfigMap allows users to provide additional config data to the kpt function.
-	ConfigMap []string `yaml:"configMap,omitempty"`
-}
-
-// Validator describes the supported kpt validators.
-type Validator struct {
-	// Name is the Validator name. Can only accept skaffold whitelisted tools.
-	Name string `yaml:"name" yamltags:"required"`
-	// ConfigMap allows users to provide additional config data to the kpt function.
-	ConfigMap []string `yaml:"configMap,omitempty"`
-}
-
-// KptV2Deploy contains all the configuration needed by the deploy steps.
-type KptV2Deploy struct {
-	// Dir is equivalent to the dir in `kpt live apply <dir>`. If not provided, skaffold deploys from the default
-	// hydrated path `<WORKDIR>/.kpt-pipeline`.
-	Dir string `yaml:"dir,omitempty"`
-
-	// ApplyFlags are additional flags passed to `kpt live apply`.
-	ApplyFlags []string `yaml:"applyFlags,omitempty"`
-
-	// Flags are kpt global flags.
-	Flags []string `yaml:"flags,omitempty"`
-
-	// Name *alpha* is the inventory object name.
-	Name string `yaml:"name,omitempty"`
-	// InventoryID *alpha* is the inventory ID which annotates the resources being lively applied by kpt.
-	InventoryID string `yaml:"inventoryID,omitempty"`
-	// InventoryNamespace *alpha* sets the inventory namespace.
-	InventoryNamespace string `yaml:"namespace,omitempty"`
-
-	// Forces is used in `kpt live init`, which forces the inventory values to be updated, even if they are already set.
-	Force bool `yaml:"false,omitempty"`
-
-	// LifecycleHooks describes a set of lifecycle hooks that are executed before and after every deploy.
-	LifecycleHooks DeployHooks `yaml:"-"`
-}
-
-// DeployConfig contains all the configuration needed by the deploy steps.
-type DeployConfig struct {
-	DeployType `yaml:",inline"`
-
-	// StatusCheck *beta* enables waiting for deployments to stabilize.
-	StatusCheck *bool `yaml:"statusCheck,omitempty"`
-
-	// StatusCheckDeadlineSeconds *beta* is the deadline for deployments to stabilize in seconds.
-	StatusCheckDeadlineSeconds int `yaml:"statusCheckDeadlineSeconds,omitempty"`
-
-	// KubeContext is the Kubernetes context that Skaffold should deploy to.
-	// For example: `minikube`.
-	KubeContext string `yaml:"kubeContext,omitempty"`
-
-	// Logs configures how container logs are printed as a result of a deployment.
-	Logs LogsConfig `yaml:"logs,omitempty"`
-}
-
-// DeployType contains the specific implementation and parameters needed
-// for the deploy step. All three deployer types can be used at the same
-// time for hybrid workflows.
-type DeployType struct {
-	// HelmDeploy *beta* uses the `helm` CLI to apply the charts to the cluster.
-	HelmDeploy *HelmDeploy `yaml:"helm,omitempty"`
-
-	// KubectlDeploy *beta* uses a client side `kubectl apply` to deploy manifests.
-	// You'll need a `kubectl` CLI version installed that's compatible with your cluster.
-	KubectlDeploy *KubectlDeploy `yaml:"kubectl,omitempty"`
-
-	// KustomizeDeploy *beta* uses the `kustomize` CLI to "patch" a deployment for a target environment.
-	KustomizeDeploy *KustomizeDeploy `yaml:"kustomize,omitempty"`
-
-	// KptV2Deploy *alpha* uses the `kpt` v1 to manage and deploy manifests.
-	KptV2Deploy *KptV2Deploy `yaml:"kpt,omitempty"`
-}
-
-type KubectlV2Deploy struct {
-	// Flags are additional flags passed to `kubectl`.
-	Flags KubectlFlags `yaml:"flags,omitempty"`
-
-	// DefaultNamespace is the default namespace passed to kubectl on deployment if no other override is given.
-	DefaultNamespace *string `yaml:"defaultNamespace,omitempty"`
-
-	// LifecycleHooks describes a set of lifecycle hooks that are executed before and after every deploy.
-	LifecycleHooks DeployHooks `yaml:"-"`
-}
-
-// KubectlDeploy *beta* uses a client side `kubectl apply` to deploy manifests.
-// You'll need a `kubectl` CLI version installed that's compatible with your cluster.
-type KubectlDeploy struct {
-	// Manifests lists the Kubernetes yaml or json manifests.
-	// Defaults to `["k8s/*.yaml"]`.
-	Manifests []string `yaml:"manifests,omitempty" skaffold:"filepath"`
-
-	// RemoteManifests lists Kubernetes manifests in remote clusters.
-	RemoteManifests []string `yaml:"remoteManifests,omitempty"`
-
-	// Flags are additional flags passed to `kubectl`.
-	Flags KubectlFlags `yaml:"flags,omitempty"`
-
-	// DefaultNamespace is the default namespace passed to kubectl on deployment if no other override is given.
-	DefaultNamespace *string `yaml:"defaultNamespace,omitempty"`
-
-	// LifecycleHooks describes a set of lifecycle hooks that are executed before and after every deploy.
-	LifecycleHooks DeployHooks `yaml:"-"`
-}
-
-// KubectlFlags are additional flags passed on the command
-// line to kubectl either on every command (Global), on creations (Apply)
-// or deletions (Delete).
-type KubectlFlags struct {
-	// Global are additional flags passed on every command.
-	Global []string `yaml:"global,omitempty"`
-
-	// Apply are additional flags passed on creations (`kubectl apply`).
-	Apply []string `yaml:"apply,omitempty"`
-
-	// Delete are additional flags passed on deletions (`kubectl delete`).
-	Delete []string `yaml:"delete,omitempty"`
-
-	// DisableValidation passes the `--validate=false` flag to supported
-	// `kubectl` commands when enabled.
-	DisableValidation bool `yaml:"disableValidation,omitempty"`
-}
-
-// KptDeploy *alpha* uses the `kpt` CLI to manage and deploy manifests.
-type KptDeploy struct {
-	// Dir is the path to the config directory (Required).
-	// By default, the Dir contains the application configurations,
-	// [kustomize config files](https://kubectl.docs.kubernetes.io/pages/examples/kustomize.html)
-	// and [declarative kpt functions](https://googlecontainertools.github.io/kpt/guides/consumer/function/#declarative-run).
-	Dir string `yaml:"dir" yamltags:"required" skaffold:"filepath"`
-
-	// Fn adds additional configurations for `kpt fn`.
-	Fn KptFn `yaml:"fn,omitempty"`
-
-	// Live adds additional configurations for `kpt live`.
-	Live KptLive `yaml:"live,omitempty"`
-
-	// LifecycleHooks describes a set of lifecycle hooks that are executed before and after every deploy.
-	LifecycleHooks DeployHooks `yaml:"-"`
-}
-
-// KptFn adds additional configurations used when calling `kpt fn`.
-type KptFn struct {
-	// FnPath is the directory to discover the declarative kpt functions.
-	// If not provided, kpt deployer uses `kpt.Dir`.
-	FnPath string `yaml:"fnPath,omitempty" skaffold:"filepath"`
-
-	// Image is a kpt function image to run the configs imperatively. If provided, kpt.fn.fnPath
-	// will be ignored.
-	Image string `yaml:"image,omitempty"`
-
-	// NetworkName is the docker network name to run the kpt function containers (default "bridge").
-	NetworkName string `yaml:"networkName,omitempty"`
-
-	// GlobalScope sets the global scope for the kpt functions. see `kpt help fn run`.
-	GlobalScope bool `yaml:"globalScope,omitempty"`
-
-	// Network enables network access for the kpt function containers.
-	Network bool `yaml:"network,omitempty"`
-
-	// Mount is a list of storage options to mount to the fn image.
-	Mount []string `yaml:"mount,omitempty"`
-
-	// SinkDir is the directory to where the manipulated resource output is stored.
-	SinkDir string `yaml:"sinkDir,omitempty" skaffold:"filepath"`
-}
-
-// KptLive adds additional configurations used when calling `kpt live`.
-type KptLive struct {
-	// Apply sets the kpt inventory directory.
-	Apply KptApplyInventory `yaml:"apply,omitempty"`
-
-	// Options adds additional configurations for `kpt live apply` commands.
-	Options KptApplyOptions `yaml:"options,omitempty"`
-}
-
-// KptApplyInventory sets the kpt inventory directory.
-type KptApplyInventory struct {
-	// Dir is equivalent to the dir in `kpt live apply <dir>`. If not provided,
-	// kpt deployer will create a hidden directory `.kpt-hydrated` to store the manipulated
-	// resource output and the kpt inventory-template.yaml file.
-	Dir string `yaml:"dir,omitempty"`
-
-	// InventoryID *alpha* is the identifier for a group of applied resources.
-	// This value is only needed when the `kpt live` is working on a pre-applied cluster resources.
-	InventoryID string `yaml:"inventoryID,omitempty"`
-
-	// InventoryNamespace *alpha* sets the inventory namespace.
-	InventoryNamespace string `yaml:"inventoryNamespace,omitempty"`
-}
-
-// KptApplyOptions adds additional configurations used when calling `kpt live apply`.
-type KptApplyOptions struct {
-	// PollPeriod sets for the polling period for resource statuses. Default to 2s.
-	PollPeriod string `yaml:"pollPeriod,omitempty"`
-
-	// PrunePropagationPolicy sets the propagation policy for pruning.
-	// Possible settings are Background, Foreground, Orphan.
-	// Default to "Background".
-	PrunePropagationPolicy string `yaml:"prunePropagationPolicy,omitempty"`
-
-	// PruneTimeout sets the time threshold to wait for all pruned resources to be deleted.
-	PruneTimeout string `yaml:"pruneTimeout,omitempty"`
-
-	// ReconcileTimeout sets the time threshold to wait for all resources to reach the current status.
-	ReconcileTimeout string `yaml:"reconcileTimeout,omitempty"`
-}
-
-// LogsConfig configures how container logs are printed as a result of a deployment.
-type LogsConfig struct {
-	// Prefix defines the prefix shown on each log line. Valid values are
-	// `container`: prefix logs lines with the name of the container.
-	// `podAndContainer`: prefix logs lines with the names of the pod and of the container.
-	// `auto`: same as `podAndContainer` except that the pod name is skipped if it's the same as the container name.
-	// `none`: don't add a prefix.
-	// Defaults to `auto`.
-	Prefix string `yaml:"prefix,omitempty"`
-}
-
-// Artifact are the items that need to be built, along with the context in which
-// they should be built.
-type Artifact struct {
-	// ImageName is the name of the image to be built.
-	// For example: `gcr.io/k8s-skaffold/example`.
-	ImageName string `yaml:"image,omitempty" yamltags:"required"`
-
-	// Workspace is the directory containing the artifact's sources.
-	// Defaults to `.`.
-	Workspace string `yaml:"context,omitempty" skaffold:"filepath"`
-
-	// Sync *beta* lists local files synced to pods instead
-	// of triggering an image build when modified.
-	// If no files are listed, sync all the files and infer the destination.
-	// Defaults to `infer: ["**/*"]`.
-	Sync *Sync `yaml:"sync,omitempty"`
-
-	// ArtifactType describes how to build an artifact.
-	ArtifactType `yaml:",inline"`
-
-	// Dependencies describes build artifacts that this artifact depends on.
-	Dependencies []*ArtifactDependency `yaml:"requires,omitempty"`
-
-	// LifecycleHooks describes a set of lifecycle hooks that are executed before and after each build of the target artifact.
-	LifecycleHooks BuildHooks `yaml:"-"`
-}
-
-// Sync *beta* specifies what files to sync into the container.
-// This is a list of sync rules indicating the intent to sync for source files.
-// If no files are listed, sync all the files and infer the destination.
-// Defaults to `infer: ["**/*"]`.
-type Sync struct {
-	// Manual lists manual sync rules indicating the source and destination.
-	Manual []*SyncRule `yaml:"manual,omitempty" yamltags:"oneOf=sync"`
-
-	// Infer lists file patterns which may be synced into the container
-	// The container destination is inferred by the builder
-	// based on the instructions of a Dockerfile.
-	// Available for docker and kaniko artifacts and custom
-	// artifacts that declare dependencies on a dockerfile.
-	Infer []string `yaml:"infer,omitempty" yamltags:"oneOf=sync"`
-
-	// Auto delegates discovery of sync rules to the build system.
-	// Only available for jib and buildpacks.
-	Auto *bool `yaml:"auto,omitempty" yamltags:"oneOf=sync"`
-
-	// LifecycleHooks describes a set of lifecycle hooks that are executed before and after each file sync action on the target artifact's containers.
-	LifecycleHooks SyncHooks `yaml:"-"`
-}
-
-// SyncRule specifies which local files to sync to remote folders.
-type SyncRule struct {
-	// Src is a glob pattern to match local paths against.
-	// Directories should be delimited by `/` on all platforms.
-	// For example: `"css/**/*.css"`.
-	Src string `yaml:"src,omitempty" yamltags:"required"`
-
-	// Dest is the destination path in the container where the files should be synced to.
-	// For example: `"app/"`
-	Dest string `yaml:"dest,omitempty" yamltags:"required"`
-
-	// Strip specifies the path prefix to remove from the source path when
-	// transplanting the files into the destination folder.
-	// For example: `"css/"`
-	Strip string `yaml:"strip,omitempty"`
-}
-
-// Profile is used to override any `build`, `test` or `deploy` configuration.
-type Profile struct {
-	// Name is a unique profile name.
-	// For example: `profile-prod`.
-	Name string `yaml:"name,omitempty" yamltags:"required"`
-
-	// Activation criteria by which a profile can be auto-activated.
-	// The profile is auto-activated if any one of the activations are triggered.
-	// An activation is triggered if all of the criteria (env, kubeContext, command) are triggered.
-	Activation []Activation `yaml:"activation,omitempty"`
-
-	// Patches lists patches applied to the configuration.
-	// Patches use the JSON patch notation.
-	Patches []JSONPatch `yaml:"patches,omitempty"`
-
-	// Pipeline contains the definitions to replace the default skaffold pipeline.
-	Pipeline `yaml:",inline"`
-}
-
-// JSONPatch patch to be applied by a profile.
-type JSONPatch struct {
-	// Op is the operation carried by the patch: `add`, `remove`, `replace`, `move`, `copy` or `test`.
-	// Defaults to `replace`.
-	Op string `yaml:"op,omitempty"`
-
-	// Path is the position in the yaml where the operation takes place.
-	// For example, this targets the `dockerfile` of the first artifact built.
-	// For example: `/build/artifacts/0/docker/dockerfile`.
-	Path string `yaml:"path,omitempty" yamltags:"required"`
-
-	// From is the source position in the yaml, used for `copy` or `move` operations.
-	From string `yaml:"from,omitempty"`
-
-	// Value is the value to apply. Can be any portion of yaml.
-	Value *util.YamlpatchNode `yaml:"value,omitempty"`
-}
-
-// Activation criteria by which a profile is auto-activated.
-type Activation struct {
-	// Env is a `key=pattern` pair. The profile is auto-activated if an Environment
-	// Variable `key` matches the pattern. If the pattern starts with `!`, activation
-	// happens if the remaining pattern is _not_ matched. The pattern matches if the
-	// Environment Variable value is exactly `pattern`, or the regex `pattern` is
-	// found in it. An empty `pattern` (e.g. `env: "key="`) always only matches if
-	// the Environment Variable is undefined or empty.
-	// For example: `ENV=production`
-	Env string `yaml:"env,omitempty"`
-
-	// KubeContext is a Kubernetes context for which the profile is auto-activated.
-	// For example: `minikube`.
-	KubeContext string `yaml:"kubeContext,omitempty"`
-
-	// Command is a Skaffold command for which the profile is auto-activated.
-	// For example: `dev`.
-	Command string `yaml:"command,omitempty"`
-}
-
-// ArtifactType describes how to build an artifact.
-type ArtifactType struct {
-	// DockerArtifact *beta* describes an artifact built from a Dockerfile.
-	DockerArtifact *DockerArtifact `yaml:"docker,omitempty" yamltags:"oneOf=artifact"`
-
-	// BazelArtifact *beta* requires bazel CLI to be installed and the sources to
-	// contain [Bazel](https://bazel.build/) configuration files.
-	BazelArtifact *BazelArtifact `yaml:"bazel,omitempty" yamltags:"oneOf=artifact"`
-
-	// JibArtifact builds images using the
-	// [Jib plugins for Maven or Gradle](https://github.com/GoogleContainerTools/jib/).
-	JibArtifact *JibArtifact `yaml:"jib,omitempty" yamltags:"oneOf=artifact"`
-
-	// KanikoArtifact builds images using [kaniko](https://github.com/GoogleContainerTools/kaniko).
-	KanikoArtifact *KanikoArtifact `yaml:"kaniko,omitempty" yamltags:"oneOf=artifact"`
-
-	// BuildpackArtifact builds images using [Cloud Native Buildpacks](https://buildpacks.io/).
-	BuildpackArtifact *BuildpackArtifact `yaml:"buildpacks,omitempty" yamltags:"oneOf=artifact"`
-
-	// CustomArtifact *beta* builds images using a custom build script written by the user.
-	CustomArtifact *CustomArtifact `yaml:"custom,omitempty" yamltags:"oneOf=artifact"`
-}
-
-// ArtifactDependency describes a specific build dependency for an artifact.
-type ArtifactDependency struct {
-	// ImageName is a reference to an artifact's image name.
-	ImageName string `yaml:"image" yamltags:"required"`
-	// Alias is a token that is replaced with the image reference in the builder definition files.
-	// For example, the `docker` builder will use the alias as a build-arg key.
-	// Defaults to the value of `image`.
-	Alias string `yaml:"alias,omitempty"`
-}
-
-// BuildpackArtifact *alpha* describes an artifact built using [Cloud Native Buildpacks](https://buildpacks.io/).
-// It can be used to build images out of project's sources without any additional configuration.
-type BuildpackArtifact struct {
-	// Builder is the builder image used.
-	Builder string `yaml:"builder" yamltags:"required"`
-
-	// RunImage overrides the stack's default run image.
-	RunImage string `yaml:"runImage,omitempty"`
-
-	// Env are environment variables, in the `key=value` form,  passed to the build.
-	// Values can use the go template syntax.
-	// For example: `["key1=value1", "key2=value2", "key3={{.ENV_VARIABLE}}"]`.
-	Env []string `yaml:"env,omitempty"`
-
-	// Buildpacks is a list of strings, where each string is a specific buildpack to use with the builder.
-	// If you specify buildpacks the builder image automatic detection will be ignored. These buildpacks will be used to build the Image from your source code.
-	// Order matters.
-	Buildpacks []string `yaml:"buildpacks,omitempty"`
-
-	// TrustBuilder indicates that the builder should be trusted.
-	TrustBuilder bool `yaml:"trustBuilder,omitempty"`
-
-	// ProjectDescriptor is the path to the project descriptor file.
-	// Defaults to `project.toml` if it exists.
-	ProjectDescriptor string `yaml:"projectDescriptor,omitempty"`
-
-	// Dependencies are the file dependencies that skaffold should watch for both rebuilding and file syncing for this artifact.
-	Dependencies *BuildpackDependencies `yaml:"dependencies,omitempty"`
-
-	// Volumes support mounting host volumes into the container.
-	Volumes *[]BuildpackVolume `yaml:"volumes,omitempty"`
-}
-
-// BuildpackDependencies *alpha* is used to specify dependencies for an artifact built by buildpacks.
-type BuildpackDependencies struct {
-	// Paths should be set to the file dependencies for this artifact, so that the skaffold file watcher knows when to rebuild and perform file synchronization.
-	Paths []string `yaml:"paths,omitempty" yamltags:"oneOf=dependency"`
-
-	// Ignore specifies the paths that should be ignored by skaffold's file watcher. If a file exists in both `paths` and in `ignore`, it will be ignored, and will be excluded from both rebuilds and file synchronization.
-	// Will only work in conjunction with `paths`.
-	Ignore []string `yaml:"ignore,omitempty"`
-}
-
-// BuildpackVolume *alpha* is used to mount host volumes or directories in the build container.
-type BuildpackVolume struct {
-	// Host is the local volume or absolute directory of the path to mount.
-	Host string `yaml:"host" skaffold:"filepath" yamltags:"required"`
-
-	// Target is the path where the file or directory is available in the container.
-	// It is strongly recommended to not specify locations under `/cnb` or `/layers`.
-	Target string `yaml:"target" yamltags:"required"`
-
-	// Options specify a list of comma-separated mount options.
-	// Valid options are:
-	// `ro` (default): volume contents are read-only.
-	// `rw`: volume contents are readable and writable.
-	// `volume-opt=<key>=<value>`: can be specified more than once, takes a key-value pair.
-	Options string `yaml:"options,omitempty"`
-}
-
-// CustomArtifact *beta* describes an artifact built from a custom build script
-// written by the user. It can be used to build images with builders that aren't directly integrated with skaffold.
-type CustomArtifact struct {
-	// BuildCommand is the command executed to build the image.
-	BuildCommand string `yaml:"buildCommand,omitempty"`
-	// Dependencies are the file dependencies that skaffold should watch for both rebuilding and file syncing for this artifact.
-	Dependencies *CustomDependencies `yaml:"dependencies,omitempty"`
-}
-
-// CustomDependencies *beta* is used to specify dependencies for an artifact built by a custom build script.
-// Either `dockerfile` or `paths` should be specified for file watching to work as expected.
-type CustomDependencies struct {
-	// Dockerfile should be set if the artifact is built from a Dockerfile, from which skaffold can determine dependencies.
-	Dockerfile *DockerfileDependency `yaml:"dockerfile,omitempty" yamltags:"oneOf=dependency"`
-
-	// Command represents a custom command that skaffold executes to obtain dependencies. The output of this command *must* be a valid JSON array.
-	Command string `yaml:"command,omitempty" yamltags:"oneOf=dependency"`
-
-	// Paths should be set to the file dependencies for this artifact, so that the skaffold file watcher knows when to rebuild and perform file synchronization.
-	Paths []string `yaml:"paths,omitempty" yamltags:"oneOf=dependency"`
-
-	// Ignore specifies the paths that should be ignored by skaffold's file watcher. If a file exists in both `paths` and in `ignore`, it will be ignored, and will be excluded from both rebuilds and file synchronization.
-	// Will only work in conjunction with `paths`.
-	Ignore []string `yaml:"ignore,omitempty"`
-}
-
-// CustomTest describes the custom test command provided by the user.
-// Custom tests are run after an image build whenever build or test dependencies are changed.
-type CustomTest struct {
-	// Command is the custom command to be executed.  If the command exits with a non-zero return
-	// code, the test will be considered to have failed.
-	Command string `yaml:"command" yamltags:"required"`
-
-	// TimeoutSeconds sets the wait time for skaffold for the command to complete.
-	// If unset or 0, Skaffold will wait until the command completes.
-	TimeoutSeconds int `yaml:"timeoutSeconds,omitempty"`
-
-	// Dependencies are additional test-specific file dependencies; changes to these files will re-run this test.
-	Dependencies *CustomTestDependencies `yaml:"dependencies,omitempty"`
-}
-
-// CustomTestDependencies is used to specify dependencies for custom test command.
-// `paths` should be specified for file watching to work as expected.
-type CustomTestDependencies struct {
-	// Command represents a command that skaffold executes to obtain dependencies. The output of this command *must* be a valid JSON array.
-	Command string `yaml:"command,omitempty" yamltags:"oneOf=dependency"`
-
-	// Paths locates the file dependencies for the command relative to workspace.
-	// Paths should be set to the file dependencies for this command, so that the skaffold file watcher knows when to retest and perform file synchronization.
-	// For example: `["src/test/**"]`
-	Paths []string `yaml:"paths,omitempty" yamltags:"oneOf=dependency"`
-
-	// Ignore specifies the paths that should be ignored by skaffold's file watcher. If a file exists in both `paths` and in `ignore`, it will be ignored, and will be excluded from both retest and file synchronization.
-	// Will only work in conjunction with `paths`.
-	Ignore []string `yaml:"ignore,omitempty"`
-}
-
-// DockerfileDependency *beta* is used to specify a custom build artifact that is built from a Dockerfile. This allows skaffold to determine dependencies from the Dockerfile.
-type DockerfileDependency struct {
-	// Path locates the Dockerfile relative to workspace.
-	Path string `yaml:"path,omitempty"`
-
-	// BuildArgs are key/value pairs used to resolve values of `ARG` instructions in a Dockerfile.
-	// Values can be constants or environment variables via the go template syntax.
-	// For example: `{"key1": "value1", "key2": "value2", "key3": "'{{.ENV_VARIABLE}}'"}`.
-	BuildArgs map[string]*string `yaml:"buildArgs,omitempty"`
-}
-
-// KanikoArtifact describes an artifact built from a Dockerfile,
-// with kaniko.
-type KanikoArtifact struct {
-
-	// Cleanup to clean the filesystem at the end of the build.
-	Cleanup bool `yaml:"cleanup,omitempty"`
-
-	// Insecure if you want to push images to a plain HTTP registry.
-	Insecure bool `yaml:"insecure,omitempty"`
-
-	// InsecurePull if you want to pull images from a plain HTTP registry.
-	InsecurePull bool `yaml:"insecurePull,omitempty"`
-
-	// NoPush if you only want to build the image, without pushing to a registry.
-	NoPush bool `yaml:"noPush,omitempty"`
-
-	// Force building outside of a container.
-	Force bool `yaml:"force,omitempty"`
-
-	// LogTimestamp to add timestamps to log format.
-	LogTimestamp bool `yaml:"logTimestamp,omitempty"`
-
-	// Reproducible is used to strip timestamps out of the built image.
-	Reproducible bool `yaml:"reproducible,omitempty"`
-
-	// SingleSnapshot is takes a single snapshot of the filesystem at the end of the build.
-	// So only one layer will be appended to the base image.
-	SingleSnapshot bool `yaml:"singleSnapshot,omitempty"`
-
-	// SkipTLS skips TLS certificate validation when pushing to a registry.
-	SkipTLS bool `yaml:"skipTLS,omitempty"`
-
-	// SkipTLSVerifyPull skips TLS certificate validation when pulling from a registry.
-	SkipTLSVerifyPull bool `yaml:"skipTLSVerifyPull,omitempty"`
-
-	// SkipUnusedStages builds only used stages if defined to true.
-	// Otherwise it builds by default all stages, even the unnecessaries ones until it reaches the target stage / end of Dockerfile.
-	SkipUnusedStages bool `yaml:"skipUnusedStages,omitempty"`
-
-	// UseNewRun to Use the experimental run implementation for detecting changes without requiring file system snapshots.
-	// In some cases, this may improve build performance by 75%.
-	UseNewRun bool `yaml:"useNewRun,omitempty"`
-
-	// WhitelistVarRun is used to ignore `/var/run` when taking image snapshot.
-	// Set it to false to preserve /var/run/* in destination image.
-	WhitelistVarRun bool `yaml:"whitelistVarRun,omitempty"`
-
-	// DockerfilePath locates the Dockerfile relative to workspace.
-	// Defaults to `Dockerfile`.
-	DockerfilePath string `yaml:"dockerfile,omitempty"`
-
-	// Target is to indicate which build stage is the target build stage.
-	Target string `yaml:"target,omitempty"`
-
-	// InitImage is the image used to run init container which mounts kaniko context.
-	InitImage string `yaml:"initImage,omitempty"`
-
-	// Image is the Docker image used by the Kaniko pod.
-	// Defaults to the latest released version of `gcr.io/kaniko-project/executor`.
-	Image string `yaml:"image,omitempty"`
-
-	// DigestFile to specify a file in the container. This file will receive the digest of a built image.
-	// This can be used to automatically track the exact image built by kaniko.
-	DigestFile string `yaml:"digestFile,omitempty"`
-
-	// ImageNameWithDigestFile specify a file to save the image name with digest of the built image to.
-	ImageNameWithDigestFile string `yaml:"imageNameWithDigestFile,omitempty"`
-
-	// LogFormat <text|color|json> to set the log format.
-	LogFormat string `yaml:"logFormat,omitempty"`
-
-	// OCILayoutPath is to specify a directory in the container where the OCI image layout of a built image will be placed.
-	// This can be used to automatically track the exact image built by kaniko.
-	OCILayoutPath string `yaml:"ociLayoutPath,omitempty"`
-
-	// RegistryMirror if you want to use a registry mirror instead of default `index.docker.io`.
-	RegistryMirror string `yaml:"registryMirror,omitempty"`
-
-	// SnapshotMode is how Kaniko will snapshot the filesystem.
-	SnapshotMode string `yaml:"snapshotMode,omitempty"`
-
-	// TarPath is path to save the image as a tarball at path instead of pushing the image.
-	TarPath string `yaml:"tarPath,omitempty"`
-
-	// Verbosity <panic|fatal|error|warn|info|debug|trace> to set the logging level.
-	Verbosity string `yaml:"verbosity,omitempty"`
-
-	// InsecureRegistry is to use plain HTTP requests when accessing a registry.
-	InsecureRegistry []string `yaml:"insecureRegistry,omitempty"`
-
-	// SkipTLSVerifyRegistry skips TLS certificate validation when accessing a registry.
-	SkipTLSVerifyRegistry []string `yaml:"skipTLSVerifyRegistry,omitempty"`
-
-	// Env are environment variables passed to the kaniko pod.
-	// It also accepts environment variables via the go template syntax.
-	// For example: `[{"name": "key1", "value": "value1"}, {"name": "key2", "value": "value2"}, {"name": "key3", "value": "'{{.ENV_VARIABLE}}'"}]`.
-	Env []v1.EnvVar `yaml:"env,omitempty"`
-
-	// Cache configures Kaniko caching. If a cache is specified, Kaniko will
-	// use a remote cache which will speed up builds.
-	Cache *KanikoCache `yaml:"cache,omitempty"`
-
-	// RegistryCertificate is to provide a certificate for TLS communication with a given registry.
-	// my.registry.url: /path/to/the/certificate.cert is the expected format.
-	RegistryCertificate map[string]*string `yaml:"registryCertificate,omitempty"`
-
-	// Label key: value to set some metadata to the final image.
-	// This is equivalent as using the LABEL within the Dockerfile.
-	Label map[string]*string `yaml:"label,omitempty"`
-
-	// BuildArgs are arguments passed to the docker build.
-	// It also accepts environment variables and generated values via the go template syntax.
-	// Exposed generated values: IMAGE_REPO, IMAGE_NAME, IMAGE_TAG.
-	// For example: `{"key1": "value1", "key2": "value2", "key3": "'{{.ENV_VARIABLE}}'"}`.
-	BuildArgs map[string]*string `yaml:"buildArgs,omitempty"`
-
-	// VolumeMounts are volume mounts passed to kaniko pod.
-	VolumeMounts []v1.VolumeMount `yaml:"volumeMounts,omitempty"`
-}
-
-// DockerArtifact describes an artifact built from a Dockerfile,
-// usually using `docker build`.
-type DockerArtifact struct {
-	// DockerfilePath locates the Dockerfile relative to workspace.
-	// Defaults to `Dockerfile`.
-	DockerfilePath string `yaml:"dockerfile,omitempty"`
-
-	// Target is the Dockerfile target name to build.
-	Target string `yaml:"target,omitempty"`
-
-	// BuildArgs are arguments passed to the docker build.
-	// For example: `{"key1": "value1", "key2": "{{ .ENV_VAR }}"}`.
-	BuildArgs map[string]*string `yaml:"buildArgs,omitempty"`
-
-	// NetworkMode is passed through to docker and overrides the
-	// network configuration of docker builder. If unset, use whatever
-	// is configured in the underlying docker daemon. Valid modes are
-	// `host`: use the host's networking stack.
-	// `bridge`: use the bridged network configuration.
-	// `container:<name|id>`: reuse another container's network stack.
-	// `none`: no networking in the container.
-	NetworkMode string `yaml:"network,omitempty"`
-
-	// AddHost lists add host.
-	// For example: `["host1:ip1", "host2:ip2"]`.
-	AddHost []string `yaml:"addHost,omitempty"`
-
-	// CacheFrom lists the Docker images used as cache sources.
-	// For example: `["golang:1.10.1-alpine3.7", "alpine:3.7"]`.
-	CacheFrom []string `yaml:"cacheFrom,omitempty"`
-
-	// NoCache used to pass in --no-cache to docker build to prevent caching.
-	NoCache bool `yaml:"noCache,omitempty"`
-
-	// Squash is used to pass in --squash to docker build to squash docker image layers into single layer.
-	Squash bool `yaml:"squash,omitempty"`
-
-	// Secret contains information about a local secret passed to `docker build`,
-	// along with optional destination information.
-	Secret *DockerSecret `yaml:"secret,omitempty"`
-
-	// SSH is used to pass in --ssh to docker build to use SSH agent. Format is "default|<id>[=<socket>|<key>[,<key>]]".
-	SSH string `yaml:"ssh,omitempty"`
-}
-
-// DockerSecret contains information about a local secret passed to `docker build`,
-// along with optional destination information.
-type DockerSecret struct {
-	// ID is the id of the secret.
-	ID string `yaml:"id,omitempty" yamltags:"required"`
-
-	// Source is the path to the secret on the host machine.
-	Source string `yaml:"src,omitempty"`
-}
-
-// BazelArtifact describes an artifact built with [Bazel](https://bazel.build/).
-type BazelArtifact struct {
-	// BuildTarget is the `bazel build` target to run.
-	// For example: `//:skaffold_example.tar`.
-	BuildTarget string `yaml:"target,omitempty" yamltags:"required"`
-
-	// BuildArgs are additional args to pass to `bazel build`.
-	// For example: `["-flag", "--otherflag"]`.
-	BuildArgs []string `yaml:"args,omitempty"`
-}
-
-// JibArtifact builds images using the
-// [Jib plugins for Maven and Gradle](https://github.com/GoogleContainerTools/jib/).
-type JibArtifact struct {
-	// Project selects which sub-project to build for multi-module builds.
-	Project string `yaml:"project,omitempty"`
-
-	// Flags are additional build flags passed to the builder.
-	// For example: `["--no-build-cache"]`.
-	Flags []string `yaml:"args,omitempty"`
-
-	// Type the Jib builder type; normally determined automatically. Valid types are
-	// `maven`: for Maven.
-	// `gradle`: for Gradle.
-	Type string `yaml:"type,omitempty"`
-
-	// BaseImage overrides the configured jib base image.
-	BaseImage string `yaml:"fromImage,omitempty"`
-}
-
-// BuildHooks describes the list of lifecycle hooks to execute before and after each artifact build step.
-type BuildHooks struct {
-	// PreHooks describes the list of lifecycle hooks to execute *before* each artifact build step.
-	PreHooks []HostHook `yaml:"before,omitempty"`
-	// PostHooks describes the list of lifecycle hooks to execute *after* each artifact build step.
-	PostHooks []HostHook `yaml:"after,omitempty"`
-}
-
-// SyncHookItem describes a single lifecycle hook to execute before or after each artifact sync step.
-type SyncHookItem struct {
-	// HostHook describes a single lifecycle hook to run on the host machine.
-	HostHook *HostHook `yaml:"host,omitempty" yamltags:"oneOf=sync_hook"`
-	// ContainerHook describes a single lifecycle hook to run on a container.
-	ContainerHook *ContainerHook `yaml:"container,omitempty" yamltags:"oneOf=sync_hook"`
-}
-
-// SyncHooks describes the list of lifecycle hooks to execute before and after each artifact sync step.
-type SyncHooks struct {
-	// PreHooks describes the list of lifecycle hooks to execute *before* each artifact sync step.
-	PreHooks []SyncHookItem `yaml:"before,omitempty"`
-	// PostHooks describes the list of lifecycle hooks to execute *after* each artifact sync step.
-	PostHooks []SyncHookItem `yaml:"after,omitempty"`
-}
-
-// DeployHookItem describes a single lifecycle hook to execute before or after each deployer step.
-type DeployHookItem struct {
-	// HostHook describes a single lifecycle hook to run on the host machine.
-	HostHook *HostHook `yaml:"host,omitempty" yamltags:"oneOf=deploy_hook"`
-	// ContainerHook describes a single lifecycle hook to run on a container.
-	ContainerHook *NamedContainerHook `yaml:"container,omitempty" yamltags:"oneOf=deploy_hook"`
-}
-
-// DeployHooks describes the list of lifecycle hooks to execute before and after each deployer step.
-type DeployHooks struct {
-	// PreHooks describes the list of lifecycle hooks to execute *before* each deployer step. Container hooks will only run if the container exists from a previous deployment step (for instance the successive iterations of a dev-loop during `skaffold dev`).
-	PreHooks []DeployHookItem `yaml:"before,omitempty"`
-	// PostHooks describes the list of lifecycle hooks to execute *after* each deployer step.
-	PostHooks []DeployHookItem `yaml:"after,omitempty"`
-}
-
-// HostHook describes a lifecycle hook definition to execute on the host machine.
-type HostHook struct {
-	// Command is the command to execute.
-	Command []string `yaml:"command" yamltags:"required"`
-	// OS is an optional slice of operating system names. If the host machine OS is different, then it skips execution.
-	OS []string `yaml:"os,omitempty"`
-}
-
-// ContainerHook describes a lifecycle hook definition to execute on a container. The container name is inferred from the scope in which this hook is defined.
-type ContainerHook struct {
-	// Command is the command to execute.
-	Command []string `yaml:"command" yamltags:"required"`
-}
-
-// 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"`
-	// 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.
-	ContainerName string `yaml:"containerName,omitempty"`
-}
-
-// UnmarshalYAML provides a custom unmarshaller to deal with
-// https://github.com/GoogleContainerTools/skaffold/issues/4175
-func (clusterDetails *ClusterDetails) UnmarshalYAML(value *yaml.Node) error {
-	// We do this as follows
-	// 1. We zero out the fields in the node that require custom processing
-	// 2. We unmarshal all the non special fields using the aliased type resource
-	//    we use an alias type to avoid recursion caused by invoking this function infinitely
-	// 3. We deserialize the special fields as required.
-	type ClusterDetailsForUnmarshaling ClusterDetails
-
-	volumes, remaining, err := util.UnmarshalClusterVolumes(value)
-
-	if err != nil {
-		return err
-	}
-
-	// Unmarshal the remaining values
-	aux := (*ClusterDetailsForUnmarshaling)(clusterDetails)
-	err = yaml.Unmarshal(remaining, aux)
-
-	if err != nil {
-		return err
-	}
-
-	clusterDetails.Volumes = volumes
-	return nil
-}
-
-// UnmarshalYAML provides a custom unmarshaller to deal with
-// https://github.com/GoogleContainerTools/skaffold/issues/4175
-func (ka *KanikoArtifact) UnmarshalYAML(value *yaml.Node) error {
-	// We do this as follows
-	// 1. We zero out the fields in the node that require custom processing
-	// 2. We unmarshal all the non special fields using the aliased type resource
-	//    we use an alias type to avoid recursion caused by invoking this function infinitely
-	// 3. We deserialize the special fields as required.
-	type KanikoArtifactForUnmarshaling KanikoArtifact
-
-	mounts, remaining, err := util.UnmarshalKanikoArtifact(value)
-
-	if err != nil {
-		return err
-	}
-
-	// Unmarshal the remaining values
-	aux := (*KanikoArtifactForUnmarshaling)(ka)
-	err = yaml.Unmarshal(remaining, aux)
-
-	if err != nil {
-		return err
-	}
-
-	ka.VolumeMounts = mounts
-	return nil
-}
-
-// MarshalYAML provides a custom marshaller to deal with
-// https://github.com/GoogleContainerTools/skaffold/issues/4175
-func (clusterDetails *ClusterDetails) MarshalYAML() (interface{}, error) {
-	// We do this as follows
-	// 1. We zero out the fields in the node that require custom processing
-	// 2. We marshall all the non special fields using the aliased type resource
-	//    we use an alias type to avoid recursion caused by invoking this function infinitely
-	// 3. We unmarshal to a map
-	// 4. We marshal the special fields to json and unmarshal to a map
-	//    * This leverages the json struct annotations to marshal as expected
-	// 5. We combine the two maps and return
-	type ClusterDetailsForUnmarshaling ClusterDetails
-
-	// Marshal volumes to a list. Use json because the Kubernetes resources have json annotations.
-	volumes := clusterDetails.Volumes
-
-	j, err := json.Marshal(volumes)
-
-	if err != nil {
-		return err, nil
-	}
-
-	vList := []interface{}{}
-
-	if err := json.Unmarshal(j, &vList); err != nil {
-		return nil, err
-	}
-
-	// Make a deep copy of clusterDetails because we need to zero out volumes and we don't want to modify the
-	// current object.
-	aux := &ClusterDetailsForUnmarshaling{}
-
-	b, err := json.Marshal(clusterDetails)
-
-	if err != nil {
-		return nil, err
-	}
-
-	if err := json.Unmarshal(b, aux); err != nil {
-		return nil, err
-	}
-
-	aux.Volumes = nil
-
-	marshaled, err := yaml.Marshal(aux)
-
-	if err != nil {
-		return nil, err
-	}
-
-	m := map[string]interface{}{}
-
-	err = yaml.Unmarshal(marshaled, m)
-
-	if len(vList) > 0 {
-		m["volumes"] = vList
-	}
-	return m, err
-}
-
-// MarshalYAML provides a custom marshaller to deal with
-// https://github.com/GoogleContainerTools/skaffold/issues/4175
-func (ka *KanikoArtifact) MarshalYAML() (interface{}, error) {
-	// We do this as follows
-	// 1. We zero out the fields in the node that require custom processing
-	// 2. We marshal all the non special fields using the aliased type resource
-	//    we use an alias type to avoid recursion caused by invoking this function infinitely
-	// 3. We unmarshal to a map
-	// 4. We marshal the special fields to json and unmarshal to a map
-	//    * This leverages the json struct annotations to marshal as expected
-	// 5. We combine the two maps and return
-	type KanikoArtifactForUnmarshaling KanikoArtifact
-
-	// Marshal volumes to a map. User json because the Kubernetes resources have json annotations.
-	volumeMounts := ka.VolumeMounts
-
-	j, err := json.Marshal(volumeMounts)
-
-	if err != nil {
-		return err, nil
-	}
-
-	vList := []interface{}{}
-
-	if err := json.Unmarshal(j, &vList); err != nil {
-		return nil, err
-	}
-
-	// Make a deep copy of kanikoArtifact because we need to zero out volumeMounts and we don't want to modify the
-	// current object.
-	aux := &KanikoArtifactForUnmarshaling{}
-
-	b, err := json.Marshal(ka)
-
-	if err != nil {
-		return nil, err
-	}
-
-	if err := json.Unmarshal(b, aux); err != nil {
-		return nil, err
-	}
-	aux.VolumeMounts = nil
-
-	marshaled, err := yaml.Marshal(aux)
-
-	if err != nil {
-		return nil, err
-	}
-
-	m := map[string]interface{}{}
-
-	err = yaml.Unmarshal(marshaled, m)
-
-	if len(vList) > 0 {
-		m["volumeMounts"] = vList
-	}
-	return m, err
-}
-
-// TODO (yuwenma): LegacyHelmDeploy and KustomizeDeploy shall be deprecated.
-
-// HelmDeploy *beta* uses the `helm` CLI to apply the charts to the cluster.
-type HelmDeploy struct {
-	// Releases is a list of Helm releases.
-	Releases []HelmRelease `yaml:"releases,omitempty" yamltags:"required"`
-
-	// Flags are additional option flags that are passed on the command
-	// line to `helm`.
-	Flags HelmDeployFlags `yaml:"flags,omitempty"`
-}
-
-// HelmDeployFlags are additional option flags that are passed on the command
-// line to `helm`.
-type HelmDeployFlags struct {
-	// Global are additional flags passed on every command.
-	Global []string `yaml:"global,omitempty"`
-
-	// Install are additional flags passed to (`helm install`).
-	Install []string `yaml:"install,omitempty"`
-
-	// Upgrade are additional flags passed to (`helm upgrade`).
-	Upgrade []string `yaml:"upgrade,omitempty"`
-}
-
-// KustomizeDeploy *beta* uses the `kustomize` CLI to "patch" a deployment for a target environment.
-type KustomizeDeploy struct {
-	// KustomizePaths is the path to Kustomization files.
-	// Defaults to `["."]`.
-	KustomizePaths []string `yaml:"paths,omitempty" skaffold:"filepath"`
-
-	// 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"`
-
-	// DefaultNamespace is the default namespace passed to kubectl on deployment if no other override is given.
-	DefaultNamespace *string `yaml:"defaultNamespace,omitempty"`
-}
-
-// HelmRelease describes a helm release to be deployed.
-type HelmRelease struct {
-	// Name is the name of the Helm release.
-	// It accepts environment variables via the go template syntax.
-	Name string `yaml:"name,omitempty" yamltags:"required"`
-
-	// ChartPath is the local path to a packaged Helm chart or an unpacked Helm chart directory.
-	ChartPath string `yaml:"chartPath,omitempty" yamltags:"oneOf=chartSource" skaffold:"filepath"`
-
-	// RemoteChart refers to a remote Helm chart reference or URL.
-	RemoteChart string `yaml:"remoteChart,omitempty" yamltags:"oneOf=chartSource"`
-
-	// ValuesFiles are the paths to the Helm `values` files.
-	ValuesFiles []string `yaml:"valuesFiles,omitempty" skaffold:"filepath"`
-
-	// ArtifactOverrides are key value pairs where the
-	// key represents the parameter used in the `--set-string` Helm CLI flag to define a container
-	// image and the value corresponds to artifact i.e. `ImageName` defined in `Build.Artifacts` section.
-	// The resulting command-line is controlled by `ImageStrategy`.
-	ArtifactOverrides util.FlatMap `yaml:"artifactOverrides,omitempty"`
-
-	// Namespace is the Kubernetes namespace.
-	Namespace string `yaml:"namespace,omitempty"`
-
-	// Version is the version of the chart.
-	Version string `yaml:"version,omitempty"`
-
-	// SetValues are key-value pairs.
-	// If present, Skaffold will send `--set` flag to Helm CLI and append all pairs after the flag.
-	SetValues util.FlatMap `yaml:"setValues,omitempty"`
-
-	// SetValueTemplates are key-value pairs.
-	// If present, Skaffold will try to parse the value part of each key-value pair using
-	// environment variables in the system, then send `--set` flag to Helm CLI and append
-	// all parsed pairs after the flag.
-	SetValueTemplates util.FlatMap `yaml:"setValueTemplates,omitempty"`
-
-	// SetFiles are key-value pairs.
-	// If present, Skaffold will send `--set-file` flag to Helm CLI and append all pairs after the flag.
-	SetFiles map[string]string `yaml:"setFiles,omitempty" skaffold:"filepath"`
-
-	// CreateNamespace if `true`, Skaffold will send `--create-namespace` flag to Helm CLI.
-	// `--create-namespace` flag is available in Helm since version 3.2.
-	// Defaults is `false`.
-	CreateNamespace *bool `yaml:"createNamespace,omitempty"`
-
-	// Wait if `true`, Skaffold will send `--wait` flag to Helm CLI.
-	// Defaults to `false`.
-	Wait bool `yaml:"wait,omitempty"`
-
-	// RecreatePods if `true`, Skaffold will send `--recreate-pods` flag to Helm CLI
-	// when upgrading a new version of a chart in subsequent dev loop deploy.
-	// Defaults to `false`.
-	RecreatePods bool `yaml:"recreatePods,omitempty"`
-
-	// SkipBuildDependencies should build dependencies be skipped.
-	// Ignored for `remoteChart`.
-	SkipBuildDependencies bool `yaml:"skipBuildDependencies,omitempty"`
-
-	// UseHelmSecrets instructs skaffold to use secrets plugin on deployment.
-	UseHelmSecrets bool `yaml:"useHelmSecrets,omitempty"`
-
-	// Repo specifies the helm repository for remote charts.
-	// If present, Skaffold will send `--repo` Helm CLI flag or flags.
-	Repo string `yaml:"repo,omitempty"`
-
-	// UpgradeOnChange specifies whether to upgrade helm chart on code changes.
-	// Default is `true` when helm chart is local (has `chartPath`).
-	// Default is `false` when helm chart is remote (has `remoteChart`).
-	UpgradeOnChange *bool `yaml:"upgradeOnChange,omitempty"`
-
-	// Overrides are key-value pairs.
-	// If present, Skaffold will build a Helm `values` file that overrides
-	// the original and use it to call Helm CLI (`--f` flag).
-	Overrides util.HelmOverrides `yaml:"overrides,omitempty"`
-
-	// Packaged parameters for packaging helm chart (`helm package`).
-	Packaged *HelmPackaged `yaml:"packaged,omitempty"`
-
-	// ImageStrategy controls how an `ArtifactOverrides` entry is
-	// turned into `--set-string` Helm CLI flag or flags.
-	ImageStrategy HelmImageStrategy `yaml:"imageStrategy,omitempty"`
-}
-
-// HelmPackaged parameters for packaging helm chart (`helm package`).
-type HelmPackaged struct {
-	// Version sets the `version` on the chart to this semver version.
-	Version string `yaml:"version,omitempty"`
-
-	// AppVersion sets the `appVersion` on the chart to this version.
-	AppVersion string `yaml:"appVersion,omitempty"`
-}
-
-// HelmImageStrategy adds image configurations to the Helm `values` file.
-type HelmImageStrategy struct {
-	HelmImageConfig `yaml:",inline"`
-}
-
-// HelmImageConfig describes an image configuration.
-type HelmImageConfig struct {
-	// HelmFQNConfig is the image configuration uses the syntax `IMAGE-NAME=IMAGE-REPOSITORY:IMAGE-TAG`.
-	HelmFQNConfig *HelmFQNConfig `yaml:"fqn,omitempty" yamltags:"oneOf=helmImageStrategy"`
-
-	// HelmConventionConfig is the image configuration uses the syntax `IMAGE-NAME.repository=IMAGE-REPOSITORY, IMAGE-NAME.tag=IMAGE-TAG`.
-	HelmConventionConfig *HelmConventionConfig `yaml:"helm,omitempty" yamltags:"oneOf=helmImageStrategy"`
-}
-
-// HelmFQNConfig is the image config to use the FullyQualifiedImageName as param to set.
-type HelmFQNConfig struct {
-	// Property defines the image config.
-	Property string `yaml:"property,omitempty"`
-}
-
-// HelmConventionConfig is the image config in the syntax of image.repository and image.tag.
-type HelmConventionConfig struct {
-	// ExplicitRegistry separates `image.registry` to the image config syntax. Useful for some charts e.g. `postgresql`.
-	ExplicitRegistry bool `yaml:"explicitRegistry,omitempty"`
-}
diff --git a/pkg/skaffold/schema/v3alpha1/upgrade.go b/pkg/skaffold/schema/v3alpha1/upgrade.go
deleted file mode 100644
index a5fbde06a..000000000
--- a/pkg/skaffold/schema/v3alpha1/upgrade.go
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2021 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 v3alpha1
-
-import (
-	next "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
-	pkgutil "github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
-)
-
-// Upgrade upgrades a configuration to the next version.
-// Config changes from v3alpha1 to v3alpha2
-func (c *SkaffoldConfig) Upgrade() (util.VersionedConfig, error) {
-	var newConfig next.SkaffoldConfig
-	pkgutil.CloneThroughJSON(c, &newConfig)
-	newConfig.APIVersion = next.Version
-
-	err := util.UpgradePipelines(c, &newConfig, upgradeOnePipeline)
-	return &newConfig, err
-}
-
-func upgradeOnePipeline(oldPipeline, newPipeline interface{}) error {
-	return nil
-}
diff --git a/pkg/skaffold/schema/versions.go b/pkg/skaffold/schema/versions.go
index fe5518fd5..f64354b18 100644
--- a/pkg/skaffold/schema/versions.go
+++ b/pkg/skaffold/schema/versions.go
@@ -87,7 +87,6 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v2beta7"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v2beta8"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v2beta9"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v3alpha1"
 	misc "github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 )
 
@@ -164,7 +163,6 @@ var SchemaVersionsV1 = Versions{
 // SchemaVersionsV2 refers to all the supported API Schemas for skaffold v2 executables. The API schema versions are
 // in the range of v3alpha*.
 var SchemaVersionsV2 = Versions{
-	{v3alpha1.Version, v3alpha1.NewSkaffoldConfig},
 	{latest.Version, latest.NewSkaffoldConfig},
 }
 


Test patch:
diff --git a/integration/examples/custom-tests/skaffold.yaml b/integration/examples/custom-tests/skaffold.yaml
index 276417df7..cf9fca887 100644
--- a/integration/examples/custom-tests/skaffold.yaml
+++ b/integration/examples/custom-tests/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/structure-tests/skaffold.yaml b/integration/examples/structure-tests/skaffold.yaml
index 4100386cd..df6cb6ea0 100644
--- a/integration/examples/structure-tests/skaffold.yaml
+++ b/integration/examples/structure-tests/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/build-dependencies/skaffold.yaml b/integration/testdata/build-dependencies/skaffold.yaml
index d87c9e43c..07bda2166 100644
--- a/integration/testdata/build-dependencies/skaffold.yaml
+++ b/integration/testdata/build-dependencies/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   tagPolicy:
diff --git a/integration/testdata/build/secret/skaffold.yaml b/integration/testdata/build/secret/skaffold.yaml
index a0306fe1b..056485217 100644
--- a/integration/testdata/build/secret/skaffold.yaml
+++ b/integration/testdata/build/secret/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   local:
diff --git a/integration/testdata/build/skaffold.yaml b/integration/testdata/build/skaffold.yaml
index 1f21a65d2..57d5548af 100644
--- a/integration/testdata/build/skaffold.yaml
+++ b/integration/testdata/build/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   local:
diff --git a/integration/testdata/build/squash/skaffold.yaml b/integration/testdata/build/squash/skaffold.yaml
index becdb9feb..789e4ed3e 100644
--- a/integration/testdata/build/squash/skaffold.yaml
+++ b/integration/testdata/build/squash/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/build/ssh/skaffold.yaml b/integration/testdata/build/ssh/skaffold.yaml
index 30a9ef590..9bf25337c 100644
--- a/integration/testdata/build/ssh/skaffold.yaml
+++ b/integration/testdata/build/ssh/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   local:
diff --git a/integration/testdata/custom-test/skaffold.yaml b/integration/testdata/custom-test/skaffold.yaml
index d7c02dbab..f6a87c76f 100644
--- a/integration/testdata/custom-test/skaffold.yaml
+++ b/integration/testdata/custom-test/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/debug/skaffold.yaml b/integration/testdata/debug/skaffold.yaml
index 36c7c77b6..2b6271ae1 100644
--- a/integration/testdata/debug/skaffold.yaml
+++ b/integration/testdata/debug/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/deploy-hello-tail/skaffold.yaml b/integration/testdata/deploy-hello-tail/skaffold.yaml
index ca71a7d67..d3a13b4f3 100644
--- a/integration/testdata/deploy-hello-tail/skaffold.yaml
+++ b/integration/testdata/deploy-hello-tail/skaffold.yaml
@@ -1,2 +1,2 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
diff --git a/integration/testdata/deploy-multiple/skaffold.yaml b/integration/testdata/deploy-multiple/skaffold.yaml
index 5da988bca..f293abd2c 100644
--- a/integration/testdata/deploy-multiple/skaffold.yaml
+++ b/integration/testdata/deploy-multiple/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/dev/skaffold.yaml b/integration/testdata/dev/skaffold.yaml
index cd1cf5a9c..9b4c2d5eb 100644
--- a/integration/testdata/dev/skaffold.yaml
+++ b/integration/testdata/dev/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/diagnose/multi-config/diagnose.tmpl b/integration/testdata/diagnose/multi-config/diagnose.tmpl
index 9479f13e0..25a6a8b69 100644
--- a/integration/testdata/diagnose/multi-config/diagnose.tmpl
+++ b/integration/testdata/diagnose/multi-config/diagnose.tmpl
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 metadata:
   name: cfg2
@@ -19,7 +19,7 @@ deploy:
   logs:
     prefix: container
 ---
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 metadata:
   name: cfg3
@@ -40,7 +40,7 @@ deploy:
   logs:
     prefix: container
 ---
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/diagnose/multi-config/skaffold.yaml b/integration/testdata/diagnose/multi-config/skaffold.yaml
index bdc4c0363..155c77c42 100644
--- a/integration/testdata/diagnose/multi-config/skaffold.yaml
+++ b/integration/testdata/diagnose/multi-config/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 requires:
 - path: ./skaffold2.yaml
diff --git a/integration/testdata/diagnose/multi-config/skaffold2.yaml b/integration/testdata/diagnose/multi-config/skaffold2.yaml
index 4c5a294f2..9933935c0 100644
--- a/integration/testdata/diagnose/multi-config/skaffold2.yaml
+++ b/integration/testdata/diagnose/multi-config/skaffold2.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 metadata:
   name: cfg2
diff --git a/integration/testdata/diagnose/multi-config/skaffold3.yaml b/integration/testdata/diagnose/multi-config/skaffold3.yaml
index b7f461877..fd0cf6228 100644
--- a/integration/testdata/diagnose/multi-config/skaffold3.yaml
+++ b/integration/testdata/diagnose/multi-config/skaffold3.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 metadata:
   name: cfg3
diff --git a/integration/testdata/diagnose/temp-config/diagnose.tmpl b/integration/testdata/diagnose/temp-config/diagnose.tmpl
index 847a3822b..9603c0134 100644
--- a/integration/testdata/diagnose/temp-config/diagnose.tmpl
+++ b/integration/testdata/diagnose/temp-config/diagnose.tmpl
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/diagnose/temp-config/skaffold.yaml b/integration/testdata/diagnose/temp-config/skaffold.yaml
index e365450b5..1a671577a 100644
--- a/integration/testdata/diagnose/temp-config/skaffold.yaml
+++ b/integration/testdata/diagnose/temp-config/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/file-sync/skaffold-infer.yaml b/integration/testdata/file-sync/skaffold-infer.yaml
index ce987d617..91d67e5b1 100644
--- a/integration/testdata/file-sync/skaffold-infer.yaml
+++ b/integration/testdata/file-sync/skaffold-infer.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   tagPolicy:
diff --git a/integration/testdata/file-sync/skaffold-manual.yaml b/integration/testdata/file-sync/skaffold-manual.yaml
index 05c31b571..128efdc50 100644
--- a/integration/testdata/file-sync/skaffold-manual.yaml
+++ b/integration/testdata/file-sync/skaffold-manual.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   tagPolicy:
diff --git a/integration/testdata/getting-started/skaffold.yaml b/integration/testdata/getting-started/skaffold.yaml
index 9e577e7d3..ecca87e44 100644
--- a/integration/testdata/getting-started/skaffold.yaml
+++ b/integration/testdata/getting-started/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/gke_loadbalancer/skaffold.yaml b/integration/testdata/gke_loadbalancer/skaffold.yaml
index 36da5078d..404d9b4cf 100644
--- a/integration/testdata/gke_loadbalancer/skaffold.yaml
+++ b/integration/testdata/gke_loadbalancer/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/hello/skaffold.yaml b/integration/testdata/hello/skaffold.yaml
index f06205fcb..bc5ed7168 100644
--- a/integration/testdata/hello/skaffold.yaml
+++ b/integration/testdata/hello/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/init/compose/skaffold.yaml b/integration/testdata/init/compose/skaffold.yaml
index cf5f34ed7..56baeac11 100644
--- a/integration/testdata/init/compose/skaffold.yaml
+++ b/integration/testdata/init/compose/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 metadata:
   name: compose
diff --git a/integration/testdata/init/hello-with-manifest/skaffold.yaml b/integration/testdata/init/hello-with-manifest/skaffold.yaml
index 8b9f4bc3d..01e4b15e8 100644
--- a/integration/testdata/init/hello-with-manifest/skaffold.yaml
+++ b/integration/testdata/init/hello-with-manifest/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 metadata:
   name: hello-with-manifest
diff --git a/integration/testdata/inspect/cluster/skaffold.add.default.yaml b/integration/testdata/inspect/cluster/skaffold.add.default.yaml
index cecc27179..08e1cdc04 100644
--- a/integration/testdata/inspect/cluster/skaffold.add.default.yaml
+++ b/integration/testdata/inspect/cluster/skaffold.add.default.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/inspect/cluster/skaffold.add.profile.yaml b/integration/testdata/inspect/cluster/skaffold.add.profile.yaml
index f52a1ffe0..9bccee686 100644
--- a/integration/testdata/inspect/cluster/skaffold.add.profile.yaml
+++ b/integration/testdata/inspect/cluster/skaffold.add.profile.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/inspect/cluster/skaffold.cluster.yaml b/integration/testdata/inspect/cluster/skaffold.cluster.yaml
index 8756bbe1b..92793d1d3 100644
--- a/integration/testdata/inspect/cluster/skaffold.cluster.yaml
+++ b/integration/testdata/inspect/cluster/skaffold.cluster.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/inspect/cluster/skaffold.local.yaml b/integration/testdata/inspect/cluster/skaffold.local.yaml
index fc7e1aeb1..9533d058c 100644
--- a/integration/testdata/inspect/cluster/skaffold.local.yaml
+++ b/integration/testdata/inspect/cluster/skaffold.local.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/inspect/cluster/skaffold.modified.default.yaml b/integration/testdata/inspect/cluster/skaffold.modified.default.yaml
index 843707d10..5a9baed9f 100644
--- a/integration/testdata/inspect/cluster/skaffold.modified.default.yaml
+++ b/integration/testdata/inspect/cluster/skaffold.modified.default.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/inspect/cluster/skaffold.modified.profile.yaml b/integration/testdata/inspect/cluster/skaffold.modified.profile.yaml
index 015fbe658..3a969572f 100644
--- a/integration/testdata/inspect/cluster/skaffold.modified.profile.yaml
+++ b/integration/testdata/inspect/cluster/skaffold.modified.profile.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/inspect/gcb/skaffold.add.default.yaml b/integration/testdata/inspect/gcb/skaffold.add.default.yaml
index d1d97d3b5..e70be3256 100644
--- a/integration/testdata/inspect/gcb/skaffold.add.default.yaml
+++ b/integration/testdata/inspect/gcb/skaffold.add.default.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/inspect/gcb/skaffold.add.profile.yaml b/integration/testdata/inspect/gcb/skaffold.add.profile.yaml
index a310bf84a..c009fdc8f 100644
--- a/integration/testdata/inspect/gcb/skaffold.add.profile.yaml
+++ b/integration/testdata/inspect/gcb/skaffold.add.profile.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/inspect/gcb/skaffold.gcb.yaml b/integration/testdata/inspect/gcb/skaffold.gcb.yaml
index 63447b2c9..9a6696410 100644
--- a/integration/testdata/inspect/gcb/skaffold.gcb.yaml
+++ b/integration/testdata/inspect/gcb/skaffold.gcb.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/inspect/gcb/skaffold.local.yaml b/integration/testdata/inspect/gcb/skaffold.local.yaml
index b2504024e..111d5186f 100644
--- a/integration/testdata/inspect/gcb/skaffold.local.yaml
+++ b/integration/testdata/inspect/gcb/skaffold.local.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/inspect/gcb/skaffold.modified.default.yaml b/integration/testdata/inspect/gcb/skaffold.modified.default.yaml
index 97c4c187d..6dce3fbf9 100644
--- a/integration/testdata/inspect/gcb/skaffold.modified.default.yaml
+++ b/integration/testdata/inspect/gcb/skaffold.modified.default.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/inspect/gcb/skaffold.modified.profile.yaml b/integration/testdata/inspect/gcb/skaffold.modified.profile.yaml
index 694dd3ac8..9fc663b8a 100644
--- a/integration/testdata/inspect/gcb/skaffold.modified.profile.yaml
+++ b/integration/testdata/inspect/gcb/skaffold.modified.profile.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/jib/skaffold.yaml b/integration/testdata/jib/skaffold.yaml
index 24840c074..a5d843b8a 100644
--- a/integration/testdata/jib/skaffold.yaml
+++ b/integration/testdata/jib/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/kaniko-explicit-repo/skaffold.yaml b/integration/testdata/kaniko-explicit-repo/skaffold.yaml
index 9e0ad2168..28b01500d 100644
--- a/integration/testdata/kaniko-explicit-repo/skaffold.yaml
+++ b/integration/testdata/kaniko-explicit-repo/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/kaniko-insecure-registry/app/skaffold.yaml b/integration/testdata/kaniko-insecure-registry/app/skaffold.yaml
index 9e577e7d3..ecca87e44 100644
--- a/integration/testdata/kaniko-insecure-registry/app/skaffold.yaml
+++ b/integration/testdata/kaniko-insecure-registry/app/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/kaniko-insecure-registry/skaffold.yaml b/integration/testdata/kaniko-insecure-registry/skaffold.yaml
index 9d174e4f1..cdf2ac937 100644
--- a/integration/testdata/kaniko-insecure-registry/skaffold.yaml
+++ b/integration/testdata/kaniko-insecure-registry/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 profiles:
   - name: build-artifact
diff --git a/integration/testdata/kaniko-microservices/skaffold.yaml b/integration/testdata/kaniko-microservices/skaffold.yaml
index 3e5217145..f1616a84b 100644
--- a/integration/testdata/kaniko-microservices/skaffold.yaml
+++ b/integration/testdata/kaniko-microservices/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/kaniko-sub-folder/skaffold.yaml b/integration/testdata/kaniko-sub-folder/skaffold.yaml
index 6941d339e..a13f072a0 100644
--- a/integration/testdata/kaniko-sub-folder/skaffold.yaml
+++ b/integration/testdata/kaniko-sub-folder/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/kaniko-target/skaffold.yaml b/integration/testdata/kaniko-target/skaffold.yaml
index d44c9f2a2..265557e6e 100644
--- a/integration/testdata/kaniko-target/skaffold.yaml
+++ b/integration/testdata/kaniko-target/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/tagPolicy/skaffold.yaml b/integration/testdata/tagPolicy/skaffold.yaml
index 3b86dcbef..a14231394 100644
--- a/integration/testdata/tagPolicy/skaffold.yaml
+++ b/integration/testdata/tagPolicy/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/test-events/skaffold.yaml b/integration/testdata/test-events/skaffold.yaml
index 13f684a26..db7d36e1d 100644
--- a/integration/testdata/test-events/skaffold.yaml
+++ b/integration/testdata/test-events/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/pkg/skaffold/build/builder_mux_test.go b/pkg/skaffold/build/builder_mux_test.go
index c61c9b2f3..39371183f 100644
--- a/pkg/skaffold/build/builder_mux_test.go
+++ b/pkg/skaffold/build/builder_mux_test.go
@@ -123,12 +123,10 @@ func TestGetConcurrency(t *testing.T) {
 			pbs: []PipelineBuilder{
 				&mockPipelineBuilder{concurrency: util.IntPtr(2), builderType: "local"},
 				&mockPipelineBuilder{concurrency: util.IntPtr(2), builderType: "local"},
-				// As per docs https://github.com/GoogleContainerTools/skaffold/blob/dbd18994955f5805e80c6354ed0fd424ec4d987b/pkg/skaffold/schema/v2beta26/config.go#L287
-				// nil concurrency defaults to 1
 				&mockPipelineBuilder{concurrency: nil, builderType: "local"},
 			},
 			cliConcurrency:      -1,
-			expectedConcurrency: 1,
+			expectedConcurrency: 2,
 		},
 		{
 			description: "builder concurrency set to 0 and cli concurrency set to 1",
@@ -150,6 +148,18 @@ func TestGetConcurrency(t *testing.T) {
 			cliConcurrency:      -1,
 			expectedConcurrency: 0,
 		},
+		{
+			description: "concurrency set in a different pipeline than the builder",
+			pbs: []PipelineBuilder{
+				// build all in parallel
+				&mockPipelineBuilder{builderType: "local"},
+				&mockPipelineBuilder{builderType: "local"},
+				&mockPipelineBuilder{builderType: "local"},
+				&mockPipelineBuilder{concurrency: util.IntPtr(3), builderType: "local"},
+			},
+			cliConcurrency:      -1,
+			expectedConcurrency: 3,
+		},
 		{
 			description: "builder concurrency set to default 0 for gcb",
 			pbs: []PipelineBuilder{
diff --git a/pkg/skaffold/initializer/testdata/init/allcli/skaffold.yaml b/pkg/skaffold/initializer/testdata/init/allcli/skaffold.yaml
index a6438f280..1d485f15b 100644
--- a/pkg/skaffold/initializer/testdata/init/allcli/skaffold.yaml
+++ b/pkg/skaffold/initializer/testdata/init/allcli/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 metadata:
   name: allcli
diff --git a/pkg/skaffold/initializer/testdata/init/getting-started-kustomize/skaffold.yaml b/pkg/skaffold/initializer/testdata/init/getting-started-kustomize/skaffold.yaml
index e5abcbb70..b20f3507f 100644
--- a/pkg/skaffold/initializer/testdata/init/getting-started-kustomize/skaffold.yaml
+++ b/pkg/skaffold/initializer/testdata/init/getting-started-kustomize/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 metadata:
   name: getting-started-kustomize
diff --git a/pkg/skaffold/initializer/testdata/init/hello-no-manifest/skaffold.yaml b/pkg/skaffold/initializer/testdata/init/hello-no-manifest/skaffold.yaml
index b2b81367f..d0fdcd898 100644
--- a/pkg/skaffold/initializer/testdata/init/hello-no-manifest/skaffold.yaml
+++ b/pkg/skaffold/initializer/testdata/init/hello-no-manifest/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 metadata:
   name: hello
diff --git a/pkg/skaffold/initializer/testdata/init/hello/skaffold.yaml b/pkg/skaffold/initializer/testdata/init/hello/skaffold.yaml
index ad01c5328..0dd247b6a 100644
--- a/pkg/skaffold/initializer/testdata/init/hello/skaffold.yaml
+++ b/pkg/skaffold/initializer/testdata/init/hello/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 metadata:
   name: hello
diff --git a/pkg/skaffold/initializer/testdata/init/ignore-tags/skaffold.yaml b/pkg/skaffold/initializer/testdata/init/ignore-tags/skaffold.yaml
index bca72f98e..9b218f5ca 100644
--- a/pkg/skaffold/initializer/testdata/init/ignore-tags/skaffold.yaml
+++ b/pkg/skaffold/initializer/testdata/init/ignore-tags/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 metadata:
   name: ignore-tags
diff --git a/pkg/skaffold/initializer/testdata/init/microservices/skaffold.yaml b/pkg/skaffold/initializer/testdata/init/microservices/skaffold.yaml
index ede956297..737ea4393 100644
--- a/pkg/skaffold/initializer/testdata/init/microservices/skaffold.yaml
+++ b/pkg/skaffold/initializer/testdata/init/microservices/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 metadata:
   name: microservices
diff --git a/pkg/skaffold/initializer/testdata/init/windows/skaffold.yaml b/pkg/skaffold/initializer/testdata/init/windows/skaffold.yaml
index 7d583fb7b..e35ebace4 100644
--- a/pkg/skaffold/initializer/testdata/init/windows/skaffold.yaml
+++ b/pkg/skaffold/initializer/testdata/init/windows/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v3alpha2
+apiVersion: skaffold/v3alpha1
 kind: Config
 metadata:
   name: windows
diff --git a/pkg/skaffold/parser/config_test.go b/pkg/skaffold/parser/config_test.go
index 36162d4df..d0add640f 100644
--- a/pkg/skaffold/parser/config_test.go
+++ b/pkg/skaffold/parser/config_test.go
@@ -1343,7 +1343,7 @@ requires:
 }
 */
 
-var testSkaffoldYaml = `apiVersion: skaffold/v3alpha2
+var testSkaffoldYaml = `apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
diff --git a/pkg/skaffold/schema/latest/config.go b/pkg/skaffold/schema/latest/config.go
index 05318059b..6b189fbf3 100644
--- a/pkg/skaffold/schema/latest/config.go
+++ b/pkg/skaffold/schema/latest/config.go
@@ -26,7 +26,7 @@ import (
 )
 
 // This config version is not yet released, it is SAFE TO MODIFY the structs in this file.
-const Version string = "skaffold/v3alpha2"
+const Version string = "skaffold/v3alpha1"
 
 // NewSkaffoldConfig creates a SkaffoldConfig
 func NewSkaffoldConfig() util.VersionedConfig {
diff --git a/pkg/skaffold/schema/versions_test.go b/pkg/skaffold/schema/versions_test.go
index fa06c394d..33531948d 100644
--- a/pkg/skaffold/schema/versions_test.go
+++ b/pkg/skaffold/schema/versions_test.go
@@ -37,7 +37,6 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v2beta1"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v2beta14"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v2beta8"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v3alpha1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
@@ -676,7 +675,8 @@ func withLogsPrefix(prefix string) func(*latest.SkaffoldConfig) {
 }
 
 func TestUpgradeToNextVersion(t *testing.T) {
-	for _, versions := range []Versions{SchemaVersionsV1, SchemaVersionsV2} {
+	// TODO(MarlonGamez): reintroduce SchemaVersionsV2 to this test once there is more than one V2 schema
+	for _, versions := range []Versions{SchemaVersionsV1} {
 		for i, schemaVersion := range versions[0 : len(versions)-2] {
 			from := schemaVersion
 			to := versions[i+1]
@@ -745,7 +745,7 @@ func TestGetLatestFromCompatibilityCheck(t *testing.T) {
 		{
 
 			apiVersions: []util.VersionedConfig{
-				&v3alpha1.SkaffoldConfig{APIVersion: v3alpha1.Version},
+				&latest.SkaffoldConfig{APIVersion: latest.Version},
 			},
 			description: "valid compatibility check for all v2 schemas releases",
 			expected:    latest.Version,
@@ -754,12 +754,12 @@ func TestGetLatestFromCompatibilityCheck(t *testing.T) {
 		{
 			apiVersions: []util.VersionedConfig{
 				&v1alpha1.SkaffoldConfig{APIVersion: v1alpha1.Version},
-				&v3alpha1.SkaffoldConfig{APIVersion: v3alpha1.Version},
+				&latest.SkaffoldConfig{APIVersion: latest.Version},
 			},
 			description: "invalid compatibility among v1 and v2 versions",
 			shouldErr:   true,
 			err: fmt.Errorf("detected incompatible versions:%v are incompatible with %v",
-				[]string{latestV1.Version, v1alpha1.Version}, []string{v3alpha1.Version}),
+				[]string{latestV1.Version, v1alpha1.Version}, []string{latest.Version}),
 		},
 		{
 			apiVersions: []util.VersionedConfig{
@@ -799,7 +799,7 @@ func TestIsCompatibleWith(t *testing.T) {
 		},
 		{
 			apiVersions: []util.VersionedConfig{
-				&v3alpha1.SkaffoldConfig{APIVersion: v3alpha1.Version},
+				&latest.SkaffoldConfig{APIVersion: latest.Version},
 			},
 			description: "v2 schemas are compatible to a v2 schema",
 			toVersion:   latest.Version,
@@ -818,14 +818,13 @@ func TestIsCompatibleWith(t *testing.T) {
 		},
 		{
 			apiVersions: []util.VersionedConfig{
-				&v3alpha1.SkaffoldConfig{APIVersion: v3alpha1.Version},
 				&latest.SkaffoldConfig{APIVersion: latest.Version},
 			},
 			description: "v2 schemas are incompatible with v1.",
 			toVersion:   latestV1.Version,
 			shouldErr:   true,
 			err: fmt.Errorf("the following versions are incompatible with target version %v. upgrade aborted",
-				[]string{v3alpha1.Version, latest.Version}),
+				[]string{latest.Version}),
 		},
 	}
 	for _, test := range tests {