*: bump to v0.10.0+git (#1803)

joelanford · hasbro17 · commit 3d736d4fcb7c · 2019-08-08T16:07:11.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## Unreleased
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Bug Fixes
+
 ## v0.10.0
 
 ### Added
diff --git a/internal/pkg/scaffold/ansible/go_mod.go b/internal/pkg/scaffold/ansible/go_mod.go
@@ -65,8 +65,6 @@ replace (
 	// resolve it correctly.
 	github.com/prometheus/prometheus => github.com/prometheus/prometheus d3245f15022551c6fc8281766ea62db4d71e2747
 )
-
-replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.10.0
 `
 
 func PrintGoMod(asFile bool) error {
diff --git a/internal/pkg/scaffold/ansible/gopkgtoml.go b/internal/pkg/scaffold/ansible/gopkgtoml.go
@@ -38,8 +38,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.10.0" #osdk_version_annotation
+  branch = "master" #osdk_branch_annotation
+  # version = "=v0.10.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
@@ -66,8 +66,6 @@ replace (
 	// resolve it correctly.
 	github.com/prometheus/prometheus => github.com/prometheus/prometheus d3245f15022551c6fc8281766ea62db4d71e2747
 )
-
-replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.10.0
 `
 
 func PrintGoMod(asFile bool) error {
diff --git a/internal/pkg/scaffold/gopkgtoml.go b/internal/pkg/scaffold/gopkgtoml.go
@@ -83,8 +83,8 @@ required = [
 [[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.10.0" #osdk_version_annotation
+  branch = "master" #osdk_branch_annotation
+  # version = "=v0.10.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
@@ -69,8 +69,6 @@ replace (
 	// resolve it correctly.
 	github.com/prometheus/prometheus => github.com/prometheus/prometheus d3245f15022551c6fc8281766ea62db4d71e2747
 )
-
-replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.10.0
 `
 
 func PrintGoMod(asFile bool) error {
diff --git a/internal/pkg/scaffold/helm/gopkgtoml.go b/internal/pkg/scaffold/helm/gopkgtoml.go
@@ -38,8 +38,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.10.0" #osdk_version_annotation
+  branch = "master" #osdk_branch_annotation
+  # version = "=v0.10.0" #osdk_version_annotation
 
 [[override]]
   name = "k8s.io/api"
diff --git a/version/version.go b/version/version.go
@@ -15,7 +15,7 @@
 package version
 
 var (
-	Version    = "v0.10.0"
+	Version    = "v0.10.0+git"
 	GitVersion = "unknown"
 	GitCommit  = "unknown"
 )

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 d3245f15022551c6fc8281766ea62db4d71e2747`
`67`	`67`	`)`
`68`		`-`
`69`		`-replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.10.0`
`70`	`68`	`
`71`	`69`
`72`	`70`	`func PrintGoMod(asFile bool) error {`
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 d3245f15022551c6fc8281766ea62db4d71e2747`
`68`	`68`	`)`
`69`		`-`
`70`		`-replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.10.0`
`71`	`69`	`
`72`	`70`
`73`	`71`	`func PrintGoMod(asFile bool) error {`
Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,6 @@ replace (`
`69`	`69`	`// resolve it correctly.`
`70`	`70`	`github.com/prometheus/prometheus => github.com/prometheus/prometheus d3245f15022551c6fc8281766ea62db4d71e2747`
`71`	`71`	`)`
`72`		`-`
`73`		`-replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.10.0`
`74`	`72`	`
`75`	`73`
`76`	`74`	`func PrintGoMod(asFile bool) error {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`package version`
`16`	`16`
`17`	`17`	`var (`
`18`		`- Version = "v0.10.0"`
	`18`	`+ Version = "v0.10.0+git"`
`19`	`19`	`GitVersion = "unknown"`
`20`	`20`	`GitCommit = "unknown"`
`21`	`21`	`)`