*: bump to v0.11.0+git for master (#2052)

hasbro17 · web-flow · commit 8ecad4165202 · 2019-10-11T19:48:04.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## Unreleased
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Bug Fixes
+
 ## v0.11.0
 
 ### Added
diff --git a/internal/pkg/scaffold/ansible/go_mod.go b/internal/pkg/scaffold/ansible/go_mod.go
@@ -66,8 +66,6 @@ replace (
 	// resolve it correctly.
 	github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286
 )
-
-replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.11.0
 `
 
 func PrintGoMod() error {
diff --git a/internal/pkg/scaffold/ansible/gopkgtoml.go b/internal/pkg/scaffold/ansible/gopkgtoml.go
@@ -37,8 +37,8 @@ func (s *GopkgToml) GetInput() (input.Input, error) {
 const gopkgTomlTmpl = `[[constraint]]
   name = "github.com/operator-framework/operator-sdk"
   # The version rule is used for a specific release and the master branch for in between releases.
-  # branch = "master" #osdk_branch_annotation
-  version = "=v0.11.0" #osdk_version_annotation
+  branch = "master" #osdk_branch_annotation
+  # version = "=v0.11.0" #osdk_version_annotation
 
 [[override]]
   name = "k8s.io/api"
diff --git a/internal/pkg/scaffold/go_mod.go b/internal/pkg/scaffold/go_mod.go
@@ -65,8 +65,6 @@ replace (
 	// resolve it correctly.
 	github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286
 )
-
-replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.11.0
 `
 
 func PrintGoMod() error {
diff --git a/internal/pkg/scaffold/gopkgtoml.go b/internal/pkg/scaffold/gopkgtoml.go
@@ -74,8 +74,8 @@ const gopkgTomlTmpl = `[[override]]
 [[constraint]]
   name = "github.com/operator-framework/operator-sdk"
   # The version rule is used for a specific release and the master branch for in between releases.
-  # branch = "master" #osdk_branch_annotation
-  version = "=v0.11.0" #osdk_version_annotation
+  branch = "master" #osdk_branch_annotation
+  # version = "=v0.11.0" #osdk_version_annotation
 
 [prune]
   go-tests = true
diff --git a/internal/pkg/scaffold/helm/go_mod.go b/internal/pkg/scaffold/helm/go_mod.go
@@ -87,8 +87,6 @@ replace (
 	// resolve it correctly.
 	github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286
 )
-
-replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.11.0
 `
 
 func PrintGoMod() error {
diff --git a/internal/pkg/scaffold/helm/gopkgtoml.go b/internal/pkg/scaffold/helm/gopkgtoml.go
@@ -37,8 +37,8 @@ func (s *GopkgToml) GetInput() (input.Input, error) {
 const gopkgTomlTmpl = `[[constraint]]
   name = "github.com/operator-framework/operator-sdk"
   # The version rule is used for a specific release and the master branch for in between releases.
-  # branch = "master" #osdk_branch_annotation
-  version = "=v0.11.0" #osdk_version_annotation
+  branch = "master" #osdk_branch_annotation
+  # version = "=v0.11.0" #osdk_version_annotation
 
 [[override]]
   name = "k8s.io/api"
diff --git a/version/version.go b/version/version.go
@@ -20,7 +20,7 @@ import (
 )
 
 var (
-	Version    = "v0.11.0"
+	Version    = "v0.11.0+git"
 	GitVersion = "unknown"
 	GitCommit  = "unknown"
 	GoVersion  = fmt.Sprintf("%s %s/%s", runtime.Version(), runtime.GOOS, runtime.GOARCH)

Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,6 @@ replace (`
`66`	`66`	`// resolve it correctly.`
`67`	`67`	`github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286`
`68`	`68`	`)`
`69`		`-`
`70`		`-replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.11.0`
`71`	`69`	`
`72`	`70`
`73`	`71`	`func PrintGoMod() error {`
Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,6 @@ replace (`
`65`	`65`	`// resolve it correctly.`
`66`	`66`	`github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286`
`67`	`67`	`)`
`68`		`-`
`69`		`-replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.11.0`
`70`	`68`	`
`71`	`69`
`72`	`70`	`func PrintGoMod() error {`
Original file line number	Diff line number	Diff line change
`@@ -87,8 +87,6 @@ replace (`
`87`	`87`	`// resolve it correctly.`
`88`	`88`	`github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286`
`89`	`89`	`)`
`90`		`-`
`91`		`-replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.11.0`
`92`	`90`	`
`93`	`91`
`94`	`92`	`func PrintGoMod() error {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`var (`
`23`		`- Version = "v0.11.0"`
	`23`	`+ Version = "v0.11.0+git"`
`24`	`24`	`GitVersion = "unknown"`
`25`	`25`	`GitCommit = "unknown"`
`26`	`26`	`GoVersion = fmt.Sprintf("%s %s/%s", runtime.Version(), runtime.GOOS, runtime.GOARCH)`