*: bump to v0.8.1+git (#1474)

joelanford · web-flow · commit 031d71ef8154 · 2019-05-22T18:06:59.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## Unreleased
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Bug Fixes
+
 ## v0.8.1
 
 ### Bug Fixes
diff --git a/internal/pkg/scaffold/ansible/go_mod.go b/internal/pkg/scaffold/ansible/go_mod.go
@@ -109,7 +109,6 @@ replace (
 	github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.29.0
 	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20181117043124-c2090bec4d9b
 	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180711000925-0cf8f7e6ed1d
-	github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.8.1
 )
 `
 
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 = "v0.8.x" #osdk_branch_annotation
-  version = "=v0.8.1" #osdk_version_annotation
+  branch = "v0.8.x" #osdk_branch_annotation
+  # version = "=v0.8.1" #osdk_version_annotation
 
 [[override]]
   name = "k8s.io/api"
diff --git a/internal/pkg/scaffold/go_mod.go b/internal/pkg/scaffold/go_mod.go
@@ -89,7 +89,6 @@ replace (
 	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180711000925-0cf8f7e6ed1d
 	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.1.10
 	sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.1.11-0.20190411181648-9d55346c2bde
-	github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.8.1
 )
 `
 
diff --git a/internal/pkg/scaffold/go_mod_test.go b/internal/pkg/scaffold/go_mod_test.go
@@ -90,6 +90,5 @@ replace (
 	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180711000925-0cf8f7e6ed1d
 	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.1.10
 	sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.1.11-0.20190411181648-9d55346c2bde
-	github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.8.1
 )
 `
diff --git a/internal/pkg/scaffold/gopkgtoml.go b/internal/pkg/scaffold/gopkgtoml.go
@@ -95,8 +95,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 = "v0.8.x" #osdk_branch_annotation
-  version = "=v0.8.1" #osdk_version_annotation
+  branch = "v0.8.x" #osdk_branch_annotation
+  # version = "=v0.8.1" #osdk_version_annotation
 
 [prune]
   go-tests = true
diff --git a/internal/pkg/scaffold/gopkgtoml_test.go b/internal/pkg/scaffold/gopkgtoml_test.go
@@ -93,8 +93,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 = "v0.8.x" #osdk_branch_annotation
-  version = "=v0.8.1" #osdk_version_annotation
+  branch = "v0.8.x" #osdk_branch_annotation
+  # version = "=v0.8.1" #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
@@ -165,7 +165,6 @@ replace (
 replace (
 	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20181117043124-c2090bec4d9b
 	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180711000925-0cf8f7e6ed1d
-	github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.8.1
 )
 `
 
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 = "v0.8.x" #osdk_branch_annotation
-  version = "=v0.8.1" #osdk_version_annotation
+  branch = "v0.8.x" #osdk_branch_annotation
+  # version = "=v0.8.1" #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.8.1"
+	Version    = "v0.8.1+git"
 	GitVersion = "unknown"
 	GitCommit  = "unknown"
 )

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,6 @@ replace (`
`109`	`109`	`github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.29.0`
`110`	`110`	`k8s.io/code-generator => k8s.io/code-generator v0.0.0-20181117043124-c2090bec4d9b`
`111`	`111`	`k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180711000925-0cf8f7e6ed1d`
`112`		`- github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.8.1`
`113`	`112`	`)`
`114`	`113`	`
`115`	`114`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ replace (`
`89`	`89`	`k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180711000925-0cf8f7e6ed1d`
`90`	`90`	`sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.1.10`
`91`	`91`	`sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.1.11-0.20190411181648-9d55346c2bde`
`92`		`- github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.8.1`
`93`	`92`	`)`
`94`	`93`	`
`95`	`94`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,5 @@ replace (`
`90`	`90`	`k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180711000925-0cf8f7e6ed1d`
`91`	`91`	`sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.1.10`
`92`	`92`	`sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.1.11-0.20190411181648-9d55346c2bde`
`93`		`- github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.8.1`
`94`	`93`	`)`
`95`	`94`	`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,6 @@ replace (`
`165`	`165`	`replace (`
`166`	`166`	`k8s.io/code-generator => k8s.io/code-generator v0.0.0-20181117043124-c2090bec4d9b`
`167`	`167`	`k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180711000925-0cf8f7e6ed1d`
`168`		`- github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.8.1`
`169`	`168`	`)`
`170`	`169`	`
`171`	`170`
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.8.1"`
	`18`	`+ Version = "v0.8.1+git"`
`19`	`19`	`GitVersion = "unknown"`
`20`	`20`	`GitCommit = "unknown"`
`21`	`21`	`)`