Introduce schema v1beta4 (#1535)

Signed-off-by: David Gageot <david@gageot.net>
GoogleContainerTools · Jan 29, 2019 · f723d36 · f723d36
1 parent 3084ca3
commit f723d36
Show file tree

Hide file tree

Showing 22 changed files with 488 additions and 19 deletions.
diff --git a/integration/examples/annotated-skaffold.yaml b/integration/examples/annotated-skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta3
+apiVersion: skaffold/v1beta4
 kind: Config
 build:
   # tagPolicy (beta) determines how Skaffold is going to tag your images.

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

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

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

diff --git a/integration/examples/kaniko-local/skaffold.yaml b/integration/examples/kaniko-local/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta3
+apiVersion: skaffold/v1beta4
 kind: Config
 build:
   artifacts:

diff --git a/integration/examples/kaniko/skaffold.yaml b/integration/examples/kaniko/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta3
+apiVersion: skaffold/v1beta4
 kind: Config
 build:
   artifacts:

diff --git a/integration/examples/kustomize/skaffold.yaml b/integration/examples/kustomize/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta3
+apiVersion: skaffold/v1beta4
 kind: Config
 deploy:
   kustomize: {}
diff --git a/integration/examples/microservices/skaffold.yaml b/integration/examples/microservices/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta3
+apiVersion: skaffold/v1beta4
 kind: Config
 build:
   artifacts:

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

diff --git a/integration/examples/test-dev-job/skaffold.yaml b/integration/examples/test-dev-job/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta3
+apiVersion: skaffold/v1beta4
 kind: Config
 build:
   artifacts:

diff --git a/pkg/skaffold/deploy/testdata/foo/templates/deployment.yaml b/pkg/skaffold/deploy/testdata/foo/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta3
+apiVersion: apps/v1beta4
 kind: Deployment
 metadata:
   name: {{ template "foo.fullname" . }}

diff --git a/pkg/skaffold/schema/latest/config.go b/pkg/skaffold/schema/latest/config.go
@@ -20,7 +20,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
 )
 
-const Version string = "skaffold/v1beta3"
+const Version string = "skaffold/v1beta4"
 
 // NewSkaffoldPipeline creates a SkaffoldPipeline
 func NewSkaffoldPipeline() util.VersionedConfig {

diff --git a/pkg/skaffold/schema/v1beta2/upgrade.go b/pkg/skaffold/schema/v1beta2/upgrade.go
@@ -19,8 +19,8 @@ package v1beta2
 import (
 	"encoding/json"
 
-	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/v1beta3"
 	"github.com/pkg/errors"
 )
 

diff --git a/pkg/skaffold/schema/v1beta2/upgrade_test.go b/pkg/skaffold/schema/v1beta2/upgrade_test.go
@@ -19,7 +19,7 @@ package v1beta2
 import (
 	"testing"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v1beta3"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 	yaml "gopkg.in/yaml.v2"
 )
@@ -102,7 +102,7 @@ func verityUpgrade(t *testing.T, input, output string) {
 	upgraded, err := pipeline.Upgrade()
 	testutil.CheckError(t, false, err)
 
-	expected := latest.NewSkaffoldPipeline()
+	expected := v1beta3.NewSkaffoldPipeline()
 	err = yaml.UnmarshalStrict([]byte(output), expected)
 
 	testutil.CheckErrorAndDeepEqual(t, false, err, expected, upgraded)