Update hack/new_version.sh script and generate v2beta16 (#5748)

* update new version to reference correct paths * substitute package v1 * update latest/v1 import to current * generate v2beta16 schema * Revert "generate v2beta16 schema" This reverts commit c5342f0. * update mark_latest_released to use correct path * fix call to UpdateVersionComment * generate v2beta16
GoogleContainerTools · Apr 29, 2021 · 789d058 · 789d058
1 parent 21e3c95
commit 789d058
Show file tree

Hide file tree

Showing 86 changed files with 4,846 additions and 89 deletions.
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/v2beta15"
+skaffold_version = "skaffold/v2beta16"
 
 # 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
@@ -801,7 +801,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/v2beta15': Target schema version to upgrade to
+      --version='skaffold/v2beta16': Target schema version to upgrade to
 
 Usage:
   skaffold fix [options]

diff --git a/docs/content/en/schemas/v2beta16.json b/docs/content/en/schemas/v2beta16.json
diff --git a/hack/versions/cmd/mark_latest_released/main.go b/hack/versions/cmd/mark_latest_released/main.go
@@ -23,6 +23,6 @@ import (
 )
 
 func main() {
-	latest := path.Join("pkg", "skaffold", "schema", "latest", "config.go")
+	latest := path.Join("pkg", "skaffold", "schema", "latest", "v1", "config.go")
 	schema.UpdateVersionComment(latest, true)
 }
diff --git a/hack/versions/cmd/new/version.go b/hack/versions/cmd/new/version.go
@@ -53,9 +53,9 @@ func main() {
 	makeSchemaDir(current)
 
 	// Create a package for current version
-	walk.From(path("latest")).WhenIsFile().MustDo(func(file string, info walk.Dirent) error {
+	walk.From(path("latest", "v1")).WhenIsFile().MustDo(func(file string, info walk.Dirent) error {
 		cp(file, path(current, info.Name()))
-		sed(path(current, info.Name()), "package latest", "package "+current)
+		sed(path(current, info.Name()), "package v1", "package "+current)
 		return nil
 	})
 
@@ -70,13 +70,13 @@ func main() {
 	sed(path(current, "upgrade_test.go"), prev, current)
 
 	// Previous version now upgrades to current instead of latest
-	sed(path(prev, "upgrade.go"), "latest", current)
-	sed(path(prev, "upgrade_test.go"), "latest", current)
+	sed(path(prev, "upgrade.go"), "latest/v1", current)
+	sed(path(prev, "upgrade_test.go"), "latest/v1", current)
 
 	// Latest uses the new version
-	sed(path("latest", "config.go"), current, next)
+	sed(path("latest", "v1", "config.go"), current, next)
 
-	hackschema.UpdateVersionComment(path("latest", "config.go"), false)
+	hackschema.UpdateVersionComment(path("latest", "v1", "config.go"), false)
 
 	// Update skaffold.yaml in integration tests
 	walk.From("integration").WhenNameMatches("*skaffold*.yaml").MustDo(func(path string, _ walk.Dirent) error {

diff --git a/integration/examples/bazel/skaffold.yaml b/integration/examples/bazel/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 kind: Config
 build:
   artifacts:

diff --git a/integration/examples/buildpacks/skaffold.yaml b/integration/examples/buildpacks/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 kind: Config
 build:
   artifacts:

diff --git a/integration/examples/custom/skaffold.yaml b/integration/examples/custom/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 kind: Config
 build:
   artifacts:

diff --git a/integration/examples/jib/skaffold.yaml b/integration/examples/jib/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta15
+apiVersion: skaffold/v2beta16
 kind: Config
 build:
   artifacts:

diff --git a/integration/examples/kaniko/skaffold.yaml b/integration/examples/kaniko/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 kind: Config
 deploy:
   kustomize:

diff --git a/integration/examples/kustomize/skaffold.yaml b/integration/examples/kustomize/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta15
+apiVersion: skaffold/v2beta16
 kind: Config
 deploy:
   kustomize: {}
diff --git a/integration/examples/microservices/skaffold.yaml b/integration/examples/microservices/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 kind: Config
 requires:
 - git:

diff --git a/integration/examples/ruby/skaffold.yaml b/integration/examples/ruby/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 kind: Config
 build:
   local:

diff --git a/integration/testdata/build/skaffold.yaml b/integration/testdata/build/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 kind: Config
 build:
   artifacts:

diff --git a/integration/testdata/debug/skaffold.yaml b/integration/testdata/debug/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 kind: Config
 build:
   artifacts:

diff --git a/integration/testdata/dev/skaffold.yaml b/integration/testdata/dev/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 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/v2beta15
+apiVersion: skaffold/v2beta16
 kind: Config
 metadata:
   name: cfg2
@@ -19,7 +19,7 @@ deploy:
   logs:
     prefix: container
 ---
-apiVersion: skaffold/v2beta15
+apiVersion: skaffold/v2beta16
 kind: Config
 metadata:
   name: cfg3
@@ -40,7 +40,7 @@ deploy:
   logs:
     prefix: container
 ---
-apiVersion: skaffold/v2beta15
+apiVersion: skaffold/v2beta16
 kind: Config
 build:
   artifacts: