Prepare v2alpha4

dgageot · dgageot · commit 106bee27175e · 2020-02-03T15:09:22.000+01:00
Signed-off-by: David Gageot &lt;david@gageot.net&gt;
diff --git a/docs/config.toml b/docs/config.toml
@@ -79,7 +79,7 @@ weight = 1
 copyright = "Skaffold Authors"
 privacy_policy = "https://policies.google.com/privacy"
 github_repo = "https://github.com/GoogleContainerTools/skaffold"
-skaffold_version = "skaffold/v2alpha3"
+skaffold_version = "skaffold/v2alpha4"
 
 # Google Custom Search Engine ID. Remove or comment out to disable search.
 gcs_engine_id = "013756393218025596041:3nojel67sum"
diff --git a/docs/content/en/schemas/v2alpha4.json b/docs/content/en/schemas/v2alpha4.json
diff --git a/integration/examples/bazel/skaffold.yaml b/integration/examples/bazel/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 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/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/buildpacks/skaffold.yaml b/integration/examples/buildpacks/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/custom/skaffold.yaml b/integration/examples/custom/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 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/v2alpha3
+apiVersion: skaffold/v2alpha4
 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/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/getting-started/skaffold.yaml b/integration/examples/getting-started/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 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/v2alpha3
+apiVersion: skaffold/v2alpha4
 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/v2alpha3
+apiVersion: skaffold/v2alpha4
 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/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 build:
   tagPolicy:
diff --git a/integration/examples/hot-reload/skaffold.yaml b/integration/examples/hot-reload/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 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/v2alpha3
+apiVersion: skaffold/v2alpha4
 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/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/jib/skaffold.yaml b/integration/examples/jib/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/kaniko/skaffold.yaml b/integration/examples/kaniko/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 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/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 deploy:
   kustomize:
diff --git a/integration/examples/kustomize/skaffold.yaml b/integration/examples/kustomize/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 deploy:
   kustomize: {}
diff --git a/integration/examples/microservices/skaffold.yaml b/integration/examples/microservices/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/nodejs/skaffold.yaml b/integration/examples/nodejs/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/profile-patches/skaffold.yaml b/integration/examples/profile-patches/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 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/v2alpha3
+apiVersion: skaffold/v2alpha4
 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/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 build:
   artifacts:
diff --git a/integration/examples/ruby/skaffold.yaml b/integration/examples/ruby/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 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/v2alpha3
+apiVersion: skaffold/v2alpha4
 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/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/build/skaffold.yaml b/integration/testdata/build/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 build:
   local:
diff --git a/integration/testdata/debug/skaffold.yaml b/integration/testdata/debug/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 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/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/dev/skaffold.yaml b/integration/testdata/dev/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 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/v2alpha3
+apiVersion: skaffold/v2alpha4
 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/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 metadata:
   name: compose
diff --git a/integration/testdata/jib/skaffold.yaml b/integration/testdata/jib/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 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/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/kaniko-insecure-registry/app/skaffold.yaml b/integration/testdata/kaniko-insecure-registry/app/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/kaniko-insecure-registry/skaffold.yaml b/integration/testdata/kaniko-insecure-registry/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 profiles:
   - name: build-artifact
diff --git a/integration/testdata/kaniko-microservices/skaffold.yaml b/integration/testdata/kaniko-microservices/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/kaniko-sub-folder/skaffold.yaml b/integration/testdata/kaniko-sub-folder/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/kaniko-target/skaffold.yaml b/integration/testdata/kaniko-target/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 build:
   artifacts:
diff --git a/integration/testdata/tagPolicy/skaffold.yaml b/integration/testdata/tagPolicy/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 build:
   artifacts:
diff --git a/pkg/skaffold/initializer/testdata/init/allcli/skaffold.yaml b/pkg/skaffold/initializer/testdata/init/allcli/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 metadata:
   name: allcli
diff --git 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/v2alpha3
+apiVersion: skaffold/v2alpha4
 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
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 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
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 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
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2alpha3
+apiVersion: skaffold/v2alpha4
 kind: Config
 metadata:
   name: microservices
diff --git a/pkg/skaffold/schema/latest/config.go b/pkg/skaffold/schema/latest/config.go
@@ -22,8 +22,8 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
 )
 
-// !!! WARNING !!! This config version is already released, please DO NOT MODIFY the structs in this file.
-const Version string = "skaffold/v2alpha3"
+// This config version is not yet released, it is SAFE TO MODIFY the structs in this file.
+const Version string = "skaffold/v2alpha4"
 
 // NewSkaffoldConfig creates a SkaffoldConfig
 func NewSkaffoldConfig() util.VersionedConfig {
diff --git a/pkg/skaffold/schema/v2alpha2/upgrade.go b/pkg/skaffold/schema/v2alpha2/upgrade.go
@@ -17,8 +17,8 @@ limitations under the License.
 package v2alpha2
 
 import (
-	next "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
+	next "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v2alpha3"
 	pkgutil "github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 )
 
diff --git a/pkg/skaffold/schema/v2alpha2/upgrade_test.go b/pkg/skaffold/schema/v2alpha2/upgrade_test.go
@@ -21,7 +21,7 @@ import (
 
 	yaml "gopkg.in/yaml.v2"
 
-	next "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
+	next "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v2alpha3"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/pkg/skaffold/schema/v2alpha3/config.go b/pkg/skaffold/schema/v2alpha3/config.go
diff --git a/pkg/skaffold/schema/v2alpha3/upgrade.go b/pkg/skaffold/schema/v2alpha3/upgrade.go
diff --git a/pkg/skaffold/schema/v2alpha3/upgrade_test.go b/pkg/skaffold/schema/v2alpha3/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/v2alpha3`
	`1`	`+apiVersion: skaffold/v2alpha4`
`2`	`2`	`kind: Config`
`3`	`3`	`build:`
`4`	`4`	`artifacts:`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ import (`
`22`	`22`	`"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"`
`23`	`23`	`)`
`24`	`24`
`25`		`-// !!! WARNING !!! This config version is already released, please DO NOT MODIFY the structs in this file.`
`26`		`-const Version string = "skaffold/v2alpha3"`
	`25`	`+// This config version is not yet released, it is SAFE TO MODIFY the structs in this file.`
	`26`	`+const Version string = "skaffold/v2alpha4"`
`27`	`27`
`28`	`28`	`// NewSkaffoldConfig creates a SkaffoldConfig`
`29`	`29`	`func NewSkaffoldConfig() util.VersionedConfig {`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ limitations under the License.`
`17`	`17`	`package v2alpha2`
`18`	`18`
`19`	`19`	`import (`
`20`		`- next "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"`
`21`	`20`	`"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"`
	`21`	`+ next "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v2alpha3"`
`22`	`22`	`pkgutil "github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"`
`23`	`23`	`)`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`
`22`	`22`	`yaml "gopkg.in/yaml.v2"`
`23`	`23`
`24`		`- next "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"`
	`24`	`+ next "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v2alpha3"`
`25`	`25`	`"github.com/GoogleContainerTools/skaffold/testutil"`
`26`	`26`	`)`
`27`	`27`