Merge branch 'master' into v3-schema

yuwenma · yuwenma · commit 52f83c0ce6a6 · 2021-04-22T09:31:44.000-07:00
diff --git a/docs/config.toml b/docs/config.toml
@@ -82,7 +82,7 @@ weight = 1
 copyright = "Skaffold Authors"
 privacy_policy = "https://policies.google.com/privacy"
 github_repo = "https://github.com/GoogleContainerTools/skaffold"
-skaffold_version = "skaffold/v2beta14"
+skaffold_version = "skaffold/v2beta15"
 
 # Google Custom Search Engine ID. Remove or comment out to disable search.
 # gcs_engine_id = "013756393218025596041:3nojel67sum"
diff --git a/docs/content/en/docs/references/cli/_index.md b/docs/content/en/docs/references/cli/_index.md
@@ -783,7 +783,7 @@ Options:
   -m, --module=[]: Filter Skaffold configs to only the provided named modules
       --overwrite=false: Overwrite original config with fixed config
       --remote-cache-dir='': Specify the location of the git repositories cache (default $HOME/.skaffold/repos)
-      --version='skaffold/v2beta14': Target schema version to upgrade to
+      --version='skaffold/v2beta15': Target schema version to upgrade to
 
 Usage:
   skaffold fix [options]
diff --git a/docs/content/en/schemas/v2beta15.json b/docs/content/en/schemas/v2beta15.json
diff --git a/integration/examples/bazel/skaffold.yaml b/integration/examples/bazel/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/buildpacks-java/skaffold.yaml b/integration/examples/buildpacks-java/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/buildpacks-node/skaffold.yaml b/integration/examples/buildpacks-node/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/buildpacks-python/skaffold.yaml b/integration/examples/buildpacks-python/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/buildpacks/skaffold.yaml b/integration/examples/buildpacks/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/custom-buildx/skaffold.yaml b/integration/examples/custom-buildx/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 
 build:
diff --git a/integration/examples/custom-tests/skaffold.yaml b/integration/examples/custom-tests/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/custom/skaffold.yaml b/integration/examples/custom/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/gcb-kaniko/skaffold.yaml b/integration/examples/gcb-kaniko/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   googleCloudBuild:
diff --git a/integration/examples/generate-pipeline/skaffold.yaml b/integration/examples/generate-pipeline/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/getting-started-kustomize/skaffold.yaml b/integration/examples/getting-started-kustomize/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 metadata:
   name: getting-started-kustomize
diff --git a/integration/examples/getting-started/skaffold.yaml b/integration/examples/getting-started/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/google-cloud-build/skaffold.yaml b/integration/examples/google-cloud-build/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   googleCloudBuild:
diff --git a/integration/examples/helm-deployment-dependencies/skaffold.yaml b/integration/examples/helm-deployment-dependencies/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   tagPolicy:
diff --git a/integration/examples/helm-deployment/skaffold.yaml b/integration/examples/helm-deployment/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/helm-remote-repo/skaffold.yaml b/integration/examples/helm-remote-repo/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 deploy:
   helm:
diff --git a/integration/examples/hot-reload/skaffold.yaml b/integration/examples/hot-reload/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/jib-gradle/skaffold.yaml b/integration/examples/jib-gradle/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/jib-multimodule/skaffold.yaml b/integration/examples/jib-multimodule/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/jib-sync/skaffold-gradle.yaml b/integration/examples/jib-sync/skaffold-gradle.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/jib-sync/skaffold-maven.yaml b/integration/examples/jib-sync/skaffold-maven.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/jib/skaffold.yaml b/integration/examples/jib/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/kaniko/skaffold.yaml b/integration/examples/kaniko/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/kustomize/skaffold-kustomize-args.yaml b/integration/examples/kustomize/skaffold-kustomize-args.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 deploy:
   kustomize:
diff --git a/integration/examples/kustomize/skaffold.yaml b/integration/examples/kustomize/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 deploy:
   kustomize: {}
diff --git a/integration/examples/microservices/skaffold.yaml b/integration/examples/microservices/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/multi-config-microservices/base/skaffold.yaml b/integration/examples/multi-config-microservices/base/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 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
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 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
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 metadata:
   name: web-config
diff --git a/integration/examples/multi-config-microservices/skaffold.yaml b/integration/examples/multi-config-microservices/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 requires:
 - path: ./leeroy-app
diff --git a/integration/examples/nodejs/skaffold.yaml b/integration/examples/nodejs/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 
 build:
diff --git a/integration/examples/profile-patches/skaffold.yaml b/integration/examples/profile-patches/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 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
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   # only build and deploy "world-service" on main profile
diff --git a/integration/examples/react-reload/skaffold.yaml b/integration/examples/react-reload/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/remote-multi-config-microservices/skaffold.yaml b/integration/examples/remote-multi-config-microservices/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 requires:
 - git:
diff --git a/integration/examples/ruby/skaffold.yaml b/integration/examples/ruby/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/simple-artifact-dependency/skaffold.yaml b/integration/examples/simple-artifact-dependency/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/structure-tests/skaffold.yaml b/integration/examples/structure-tests/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/tagging-with-environment-variables/skaffold.yaml b/integration/examples/tagging-with-environment-variables/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/templated-fields/skaffold.yaml b/integration/examples/templated-fields/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 metadata:
   name: my-app
diff --git a/integration/examples/typescript/skaffold.yaml b/integration/examples/typescript/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 
 build:
diff --git a/integration/testdata/build-dependencies/skaffold.yaml b/integration/testdata/build-dependencies/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   tagPolicy:
diff --git a/integration/testdata/build/secret/skaffold.yaml b/integration/testdata/build/secret/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   local:
diff --git a/integration/testdata/build/skaffold.yaml b/integration/testdata/build/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   local:
diff --git a/integration/testdata/build/squash/skaffold.yaml b/integration/testdata/build/squash/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/build/ssh/skaffold.yaml b/integration/testdata/build/ssh/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   local:
diff --git a/integration/testdata/custom-test/skaffold.yaml b/integration/testdata/custom-test/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/debug/skaffold.yaml b/integration/testdata/debug/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/deploy-multiple/skaffold.yaml b/integration/testdata/deploy-multiple/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/dev/skaffold.yaml b/integration/testdata/dev/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/diagnose/multi-config/skaffold.yaml b/integration/testdata/diagnose/multi-config/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 requires:
 - path: ./skaffold2.yaml
diff --git a/integration/testdata/diagnose/multi-config/skaffold2.yaml b/integration/testdata/diagnose/multi-config/skaffold2.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 metadata:
   name: cfg2
diff --git a/integration/testdata/diagnose/multi-config/skaffold3.yaml b/integration/testdata/diagnose/multi-config/skaffold3.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 metadata:
   name: cfg3
diff --git a/integration/testdata/diagnose/multi-config/skaffold_merged.yaml b/integration/testdata/diagnose/multi-config/skaffold_merged.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 metadata:
   name: cfg2
@@ -19,7 +19,7 @@ deploy:
   logs:
     prefix: container
 ---
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 metadata:
   name: cfg3
@@ -40,7 +40,7 @@ deploy:
   logs:
     prefix: container
 ---
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/gke_loadbalancer/skaffold.yaml b/integration/testdata/gke_loadbalancer/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/hello/skaffold.yaml b/integration/testdata/hello/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/init/compose/skaffold.yaml b/integration/testdata/init/compose/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 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
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 metadata:
   name: hello-with-manifest
diff --git a/integration/testdata/jib/skaffold.yaml b/integration/testdata/jib/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/kaniko-explicit-repo/skaffold.yaml b/integration/testdata/kaniko-explicit-repo/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta14
+apiVersion: skaffold/v2beta15
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/kaniko-insecure-registry/app/skaffold.yaml b/integration/testdata/kaniko-insecure-registry/app/skaffold.yaml
diff --git a/integration/testdata/kaniko-insecure-registry/skaffold.yaml b/integration/testdata/kaniko-insecure-registry/skaffold.yaml
diff --git a/integration/testdata/kaniko-microservices/skaffold.yaml b/integration/testdata/kaniko-microservices/skaffold.yaml
diff --git a/integration/testdata/kaniko-sub-folder/skaffold.yaml b/integration/testdata/kaniko-sub-folder/skaffold.yaml
diff --git a/integration/testdata/kaniko-target/skaffold.yaml b/integration/testdata/kaniko-target/skaffold.yaml
diff --git a/integration/testdata/tagPolicy/skaffold.yaml b/integration/testdata/tagPolicy/skaffold.yaml
diff --git a/integration/testdata/test-events/skaffold.yaml b/integration/testdata/test-events/skaffold.yaml
diff --git a/pkg/skaffold/initializer/testdata/init/allcli/skaffold.yaml b/pkg/skaffold/initializer/testdata/init/allcli/skaffold.yaml
diff --git a/pkg/skaffold/initializer/testdata/init/getting-started-kustomize/skaffold.yaml b/pkg/skaffold/initializer/testdata/init/getting-started-kustomize/skaffold.yaml
diff --git a/pkg/skaffold/initializer/testdata/init/hello-no-manifest/skaffold.yaml b/pkg/skaffold/initializer/testdata/init/hello-no-manifest/skaffold.yaml
diff --git a/pkg/skaffold/initializer/testdata/init/hello/skaffold.yaml b/pkg/skaffold/initializer/testdata/init/hello/skaffold.yaml
diff --git a/pkg/skaffold/initializer/testdata/init/ignore-tags/skaffold.yaml b/pkg/skaffold/initializer/testdata/init/ignore-tags/skaffold.yaml
diff --git a/pkg/skaffold/initializer/testdata/init/microservices/skaffold.yaml b/pkg/skaffold/initializer/testdata/init/microservices/skaffold.yaml
diff --git a/pkg/skaffold/initializer/testdata/init/windows/skaffold.yaml b/pkg/skaffold/initializer/testdata/init/windows/skaffold.yaml
diff --git a/pkg/skaffold/schema/latest/config.go b/pkg/skaffold/schema/latest/config.go
diff --git a/pkg/skaffold/schema/v2beta13/upgrade.go b/pkg/skaffold/schema/v2beta13/upgrade.go
diff --git a/pkg/skaffold/schema/v2beta13/upgrade_test.go b/pkg/skaffold/schema/v2beta13/upgrade_test.go
diff --git a/pkg/skaffold/schema/v2beta14/config.go b/pkg/skaffold/schema/v2beta14/config.go
diff --git a/pkg/skaffold/schema/v2beta14/upgrade.go b/pkg/skaffold/schema/v2beta14/upgrade.go
diff --git a/pkg/skaffold/schema/v2beta14/upgrade_test.go b/pkg/skaffold/schema/v2beta14/upgrade_test.go
diff --git a/pkg/skaffold/schema/versions.go b/pkg/skaffold/schema/versions.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-apiVersion: skaffold/v2beta14`
	`1`	`+apiVersion: skaffold/v2beta15`
`2`	`2`	`kind: Config`
`3`	`3`	`build:`
`4`	`4`	`artifacts:`