Merge branch 'master' of https://github.com/GoogleContainerTools/skaf…

…fold into add-v2-definitions

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/v2beta12"
+skaffold_version = "skaffold/v2beta13"
 
 # Google Custom Search Engine ID. Remove or comment out to disable search.
 # gcs_engine_id = "013756393218025596041:3nojel67sum"

docs/content/en/docs/references/cli/_index.md

@@ -736,7 +736,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/v2beta12': Target schema version to upgrade to
+      --version='skaffold/v2beta13': Target schema version to upgrade to
 
 Usage:
   skaffold fix [options]

go.mod

@@ -35,7 +35,8 @@ require (
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
 	github.com/golang/protobuf v1.4.3
 	github.com/google/go-cmp v0.5.4
-	github.com/google/go-containerregistry v0.4.0
+	github.com/google/go-containerregistry v0.4.1-0.20210128200529-19c2b639fab1
+	github.com/google/go-containerregistry/pkg/authn/k8schain v0.0.0-20210216200643-d81088d9983e // indirect
 	github.com/google/go-github v17.0.0+incompatible
 	github.com/google/uuid v1.1.2
 	github.com/grpc-ecosystem/grpc-gateway v1.14.8
@@ -64,21 +65,21 @@ require (
 	go.opentelemetry.io/otel/exporters/stdout v0.13.0
 	go.opentelemetry.io/otel/sdk v0.13.0
 	golang.org/x/mod v0.4.1
-	golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb // indirect
 	golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58
 	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
-	golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211
-	golang.org/x/term v0.0.0-20201117132131-f5c789dd3221
+	golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c
+	golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1
+	golang.org/x/tools v0.1.0 // indirect
 	google.golang.org/api v0.35.0
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20201202151023-55d61f90c1ce
 	google.golang.org/grpc v1.33.2
 	google.golang.org/protobuf v1.25.0
-	gopkg.in/yaml.v2 v2.3.0
+	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
-	k8s.io/api v0.19.4
-	k8s.io/apimachinery v0.19.4
-	k8s.io/client-go v0.19.4
+	k8s.io/api v0.19.7
+	k8s.io/apimachinery v0.19.7
+	k8s.io/client-go v0.19.7
 	k8s.io/kubectl v0.19.4
 	k8s.io/utils v0.0.0-20200729134348-d5654de09c73
 	knative.dev/pkg v0.0.0-20201119170152-e5e30edc364a // indirect

hack/versions/cmd/new/version.go

@@ -18,10 +18,12 @@ package main
 
 import (
 	"bufio"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"regexp"
+	"strconv"
 	"strings"
 
 	"github.com/sirupsen/logrus"
@@ -45,6 +47,9 @@ func main() {
 		logrus.Fatalf("There is no need to create a new version, %s is still not released", current)
 	}
 
+	next := readNextVersion(current)
+	logrus.Infof("Next Skaffold version: %s", next)
+
 	makeSchemaDir(current)
 
 	// Create a package for current version
@@ -54,8 +59,6 @@ func main() {
 		return nil
 	})
 
-	next := readNextVersion()
-
 	// Create code to upgrade from current to new
 	cp(path(prev, "upgrade.go"), path(current, "upgrade.go"))
 	sed(path(current, "upgrade.go"), current, next)
@@ -110,20 +113,37 @@ func makeSchemaDir(new string) {
 	}
 }
 
-func readNextVersion() string {
+func readNextVersion(current string) string {
 	var new string
 	if len(os.Args) <= 1 {
-		color.Red.Fprintln(os.Stdout, "Please enter new version (e.g. v1beta15): ")
+		new = bumpVersion(current)
+		color.Red.Fprintf(os.Stdout, "Please enter new version (default: %s): ", new)
 		reader := bufio.NewReader(os.Stdin)
-		if line, err := reader.ReadString('\n'); err == nil {
-			new = line
-		} else {
+		if line, err := reader.ReadString('\n'); err != nil {
 			logrus.Fatalf("error reading input: %s", err)
+		} else if strings.TrimSpace(line) != "" {
+			new = line
 		}
 	} else {
 		new = os.Args[1]
 	}
-	return strings.TrimSuffix(new, "\n")
+	return strings.TrimSpace(new)
+}
+
+// bumpVersion increments a KRM-style version string (v1 -> v2alpha1, v2beta11 -> v2beta12).
+func bumpVersion(version string) string {
+	// turn a released version into next alpha (v1 -> v2alpha1)
+	if m := regexp.MustCompile(`^v([0-9]+)$`).FindStringSubmatch(version); len(m) > 0 {
+		i, _ := strconv.Atoi(m[1])
+		return fmt.Sprintf("v%dalpha1", i+1)
+	}
+	// bump alpha/beta version by 1 (v1beta2 -> v1beta2)
+	if m := regexp.MustCompile(`^(v[0-9]+(?:alpha|beta))([0-9]+)$`).FindStringSubmatch(version); len(m) > 0 {
+		i, _ := strconv.Atoi(m[2])
+		return fmt.Sprintf("%s%d", m[1], i+1)
+	}
+	logrus.Warnf("Unrecognized version string: %s", version)
+	return version
 }
 
 func path(elem ...string) string {

integration/examples/bazel/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/buildpacks-java/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/buildpacks-node/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/buildpacks-python/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/buildpacks/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/custom/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/gcb-kaniko/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   googleCloudBuild:

integration/examples/generate-pipeline/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/getting-started-kustomize/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 metadata:
   name: getting-started-kustomize

integration/examples/getting-started/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/google-cloud-build/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   googleCloudBuild:

integration/examples/helm-deployment-dependencies/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   tagPolicy:

integration/examples/helm-deployment/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/hot-reload/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/jib-gradle/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/jib-multimodule/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/jib-sync/skaffold-gradle.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/jib-sync/skaffold-maven.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/jib/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/kaniko/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/kustomize/skaffold-kustomize-args.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 deploy:
   kustomize:

integration/examples/kustomize/skaffold.yaml

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

integration/examples/microservices/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/multi-config-microservices/base/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/multi-config-microservices/leeroy-app/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 metadata:
   name: app-config

integration/examples/multi-config-microservices/leeroy-web/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 metadata:
   name: web-config

integration/examples/multi-config-microservices/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 requires:
 - path: ./leeroy-app

integration/examples/nodejs/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 
 build:

integration/examples/profile-patches/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   # only build and deploy "base-service" on main profile

integration/examples/profiles/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   # only build and deploy "world-service" on main profile

integration/examples/react-reload/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/remote-multi-config-microservices/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 requires:
 - git:

integration/examples/ruby/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/simple-artifact-dependency/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/structure-tests/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

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

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/examples/templated-fields/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 metadata:
   name: my-app

integration/examples/typescript/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 
 build:

integration/testdata/build-dependencies/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   tagPolicy:

integration/testdata/build/secret/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   local:

integration/testdata/build/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   local:

integration/testdata/build/squash/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts:

integration/testdata/build/ssh/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   local:

integration/testdata/debug/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta12
+apiVersion: skaffold/v2beta13
 kind: Config
 build:
   artifacts: