Freeze v1beta9 config

docs/config.toml

@@ -70,7 +70,7 @@ weight = 1
 #copyright = "Skaffold"
 #privacy_policy = "https://policies.google.com/privacy"
 github_repo = "https://github.com/GoogleContainerTools/skaffold"
-skaffold_version = "skaffold/v1beta9"
+skaffold_version = "skaffold/v1beta10"
 
 # Google Custom Search Engine ID. Remove or comment out to disable search.
 gcs_engine_id = "013756393218025596041:3nojel67sum"

docs/content/en/schemas/v1beta10.json

@@ -355,8 +355,8 @@
             },
             "tagPolicy": {
               "$ref": "#/definitions/TagPolicy",
-              "description": "*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: {}`.",
-              "x-intellij-html-description": "<em>beta</em> 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 <code>gitCommit: {}</code>."
+              "description": "*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}`.",
+              "x-intellij-html-description": "<em>beta</em> 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 <code>gitCommit: {variant: Tags}</code>."
             }
           },
           "preferredOrder": [
@@ -392,8 +392,8 @@
             },
             "tagPolicy": {
               "$ref": "#/definitions/TagPolicy",
-              "description": "*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: {}`.",
-              "x-intellij-html-description": "<em>beta</em> 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 <code>gitCommit: {}</code>."
+              "description": "*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}`.",
+              "x-intellij-html-description": "<em>beta</em> 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 <code>gitCommit: {variant: Tags}</code>."
             }
           },
           "preferredOrder": [
@@ -430,8 +430,8 @@
             },
             "tagPolicy": {
               "$ref": "#/definitions/TagPolicy",
-              "description": "*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: {}`.",
-              "x-intellij-html-description": "<em>beta</em> 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 <code>gitCommit: {}</code>."
+              "description": "*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}`.",
+              "x-intellij-html-description": "<em>beta</em> 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 <code>gitCommit: {variant: Tags}</code>."
             }
           },
           "preferredOrder": [
@@ -468,8 +468,8 @@
             },
             "tagPolicy": {
               "$ref": "#/definitions/TagPolicy",
-              "description": "*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: {}`.",
-              "x-intellij-html-description": "<em>beta</em> 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 <code>gitCommit: {}</code>."
+              "description": "*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}`.",
+              "x-intellij-html-description": "<em>beta</em> 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 <code>gitCommit: {variant: Tags}</code>."
             }
           },
           "preferredOrder": [
@@ -691,6 +691,17 @@
       "x-intellij-html-description": "<em>beta</em> tags images with a configurable template string."
     },
     "GitTagger": {
+      "properties": {
+        "variant": {
+          "type": "string",
+          "description": "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.",
+          "x-intellij-html-description": "determines the behavior of the git tagger. Valid variants are <code>Tags</code> (default): use git tags or fall back to abbreviated commit hash. <code>CommitSha</code>: use the full git commit sha. <code>AbbrevCommitSha</code>: use the abbreviated git commit sha."
+        }
+      },
+      "preferredOrder": [
+        "variant"
+      ],
+      "additionalProperties": false,
       "description": "*beta* tags images with the git tag or commit of the artifact's workspace.",
       "x-intellij-html-description": "<em>beta</em> tags images with the git tag or commit of the artifact's workspace."
     },

integration/examples/bazel/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta9
+apiVersion: skaffold/v1beta10
 kind: Config
 build:
   artifacts:

integration/examples/getting-started/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta9
+apiVersion: skaffold/v1beta10
 kind: Config
 build:
   artifacts:

integration/examples/helm-deployment/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta9
+apiVersion: skaffold/v1beta10
 kind: Config
 build:
   tagPolicy:

integration/examples/hot-reload/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta9
+apiVersion: skaffold/v1beta10
 kind: Config
 build:
   artifacts:

integration/examples/jib-multimodule/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta9
+apiVersion: skaffold/v1beta10
 kind: Config
 build:
   artifacts:

integration/examples/jib/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta9
+apiVersion: skaffold/v1beta10
 kind: Config
 build:
   artifacts:

integration/examples/kaniko-local/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta9
+apiVersion: skaffold/v1beta10
 kind: Config
 build:
   artifacts:

integration/examples/kaniko/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta9
+apiVersion: skaffold/v1beta10
 kind: Config
 build:
   artifacts:

integration/examples/kustomize/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta9
+apiVersion: skaffold/v1beta10
 kind: Config
 deploy:
   kustomize: {}

integration/examples/microservices/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta9
+apiVersion: skaffold/v1beta10
 kind: Config
 build:
   artifacts:

integration/examples/nodejs/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta9
+apiVersion: skaffold/v1beta10
 kind: Config
 build:
   artifacts:

integration/examples/react-reload/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta9
+apiVersion: skaffold/v1beta10
 kind: Config
 build:
   artifacts:

integration/examples/structure-tests/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta9
+apiVersion: skaffold/v1beta10
 kind: Config
 build:
   artifacts:

integration/examples/tagging-with-environment-variables/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta9
+apiVersion: skaffold/v1beta10
 kind: Config
 build:
   artifacts:

integration/testdata/build/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta9
+apiVersion: skaffold/v1beta10
 kind: Config
 build:
   local:

integration/testdata/dev/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta9
+apiVersion: skaffold/v1beta10
 kind: Config
 build:
   artifacts:

integration/testdata/file-sync/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta9
+apiVersion: skaffold/v1beta10
 kind: Config
 build:
   tagPolicy:

integration/testdata/jib/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta9
+apiVersion: skaffold/v1beta10
 kind: Config
 build:
   artifacts:

integration/testdata/kaniko-microservices/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta9
+apiVersion: skaffold/v1beta10
 kind: Config
 build:
   artifacts:

integration/testdata/kaniko-sub-folder/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta9
+apiVersion: skaffold/v1beta10
 kind: Config
 build:
   artifacts:

integration/testdata/tagPolicy/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v1beta9
+apiVersion: skaffold/v1beta10
 kind: Config
 build:
   artifacts:

pkg/skaffold/schema/latest/config.go

@@ -20,7 +20,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
 )
 
-const Version string = "skaffold/v1beta9"
+const Version string = "skaffold/v1beta10"
 
 // NewSkaffoldConfig creates a SkaffoldConfig
 func NewSkaffoldConfig() util.VersionedConfig {

pkg/skaffold/schema/v1beta8/upgrade.go

@@ -17,8 +17,8 @@ limitations under the License.
 package v1beta8
 
 import (
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
+	next "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v1beta9"
 	pkgutil "github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
@@ -32,13 +32,13 @@ import (
 // 3. No updates
 func (config *SkaffoldConfig) Upgrade() (util.VersionedConfig, error) {
 	// convert Deploy (should be the same)
-	var newDeploy latest.DeployConfig
+	var newDeploy next.DeployConfig
 	if err := pkgutil.CloneThroughJSON(config.Deploy, &newDeploy); err != nil {
 		return nil, errors.Wrap(err, "converting deploy config")
 	}
 
 	// convert Profiles (should be the same)
-	var newProfiles []latest.Profile
+	var newProfiles []next.Profile
 	if config.Profiles != nil {
 		if err := pkgutil.CloneThroughJSON(config.Profiles, &newProfiles); err != nil {
 			return nil, errors.Wrap(err, "converting new profile")
@@ -52,7 +52,7 @@ func (config *SkaffoldConfig) Upgrade() (util.VersionedConfig, error) {
 	}
 
 	// convert Build (should be same)
-	var newBuild latest.BuildConfig
+	var newBuild next.BuildConfig
 	if err := pkgutil.CloneThroughJSON(config.Build, &newBuild); err != nil {
 		return nil, errors.Wrap(err, "converting new build")
 	}
@@ -62,15 +62,15 @@ func (config *SkaffoldConfig) Upgrade() (util.VersionedConfig, error) {
 	}
 
 	// convert Test (should be the same)
-	var newTest []*latest.TestCase
+	var newTest []*next.TestCase
 	if err := pkgutil.CloneThroughJSON(config.Test, &newTest); err != nil {
 		return nil, errors.Wrap(err, "converting new test")
 	}
 
-	return &latest.SkaffoldConfig{
-		APIVersion: latest.Version,
+	return &next.SkaffoldConfig{
+		APIVersion: next.Version,
 		Kind:       config.Kind,
-		Pipeline: latest.Pipeline{
+		Pipeline: next.Pipeline{
 			Build:  newBuild,
 			Test:   newTest,
 			Deploy: newDeploy,
@@ -79,13 +79,13 @@ func (config *SkaffoldConfig) Upgrade() (util.VersionedConfig, error) {
 	}, nil
 }
 
-func updateBuild(config *BuildConfig, newBuild *latest.BuildConfig) error {
+func updateBuild(config *BuildConfig, newBuild *next.BuildConfig) error {
 	for i, a := range config.Artifacts {
 		if a.BuilderPlugin == nil {
 			continue
 		}
 		if a.BuilderPlugin.Name == "bazel" {
-			var ba *latest.BazelArtifact
+			var ba *next.BazelArtifact
 			contents, err := yaml.Marshal(a.BuilderPlugin.Properties)
 			if err != nil {
 				return errors.Wrap(err, "unmarshalling properties")
@@ -97,7 +97,7 @@ func updateBuild(config *BuildConfig, newBuild *latest.BuildConfig) error {
 		}
 
 		if a.BuilderPlugin.Name == "docker" {
-			var da *latest.DockerArtifact
+			var da *next.DockerArtifact
 			contents, err := yaml.Marshal(a.BuilderPlugin.Properties)
 			if err != nil {
 				return errors.Wrap(err, "unmarshalling properties")
@@ -111,7 +111,7 @@ func updateBuild(config *BuildConfig, newBuild *latest.BuildConfig) error {
 
 	if c := config.ExecutionEnvironment; c != nil {
 		if c.Name == "googleCloudBuild" {
-			var gcb *latest.GoogleCloudBuild
+			var gcb *next.GoogleCloudBuild
 			contents, err := yaml.Marshal(c.Properties)
 			if err != nil {
 				return errors.Wrap(err, "unmarshalling properties")
@@ -122,7 +122,7 @@ func updateBuild(config *BuildConfig, newBuild *latest.BuildConfig) error {
 			newBuild.GoogleCloudBuild = gcb
 		}
 		if c.Name == "local" {
-			var local *latest.LocalBuild
+			var local *next.LocalBuild
 			contents, err := yaml.Marshal(c.Properties)
 			if err != nil {
 				return errors.Wrap(err, "unmarshalling properties")

pkg/skaffold/schema/v1beta8/upgrade_test.go

@@ -19,7 +19,7 @@ package v1beta8
 import (
 	"testing"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
+	next "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v1beta9"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 	yaml "gopkg.in/yaml.v2"
 )
@@ -152,7 +152,7 @@ func verifyUpgrade(t *testing.T, input, output string) {
 	upgraded, err := config.Upgrade()
 	testutil.CheckError(t, false, err)
 
-	expected := latest.NewSkaffoldConfig()
+	expected := next.NewSkaffoldConfig()
 	err = yaml.UnmarshalStrict([]byte(output), expected)
 
 	testutil.CheckErrorAndDeepEqual(t, false, err, expected, upgraded)