0.21.0 merge to master

pkg/version/base.go

@@ -36,8 +36,8 @@ package version
 var (
 	// TODO: Deprecate gitMajor and gitMinor, use only gitVersion instead.
 	gitMajor     string = "0"              // major version, always numeric
-	gitMinor     string = "20.2+"          // minor version, numeric possibly followed by "+"
-	gitVersion   string = "v0.20.2-dev"    // version from git, output of $(git describe)
+	gitMinor     string = "21.0+"          // minor version, numeric possibly followed by "+"
+	gitVersion   string = "v0.21.0-dev"    // version from git, output of $(git describe)
 	gitCommit    string = ""               // sha1 from git, output of $(git rev-parse HEAD)
 	gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty"
 )