*: bump to v0.4.0+git (operator-framework#959)

Bump master branch to `v0.4.0+git`
nate-duke · Jan 18, 2019 · f929921 · f929921
1 parent cc5fe88
commit f929921
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## Unreleased
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Bug Fixes
+
 ## v0.4.0
 
 ### Added
@@ -14,10 +26,6 @@
   - [quay.io/operator-framework/ansible-operator](https://quay.io/repository/operator-framework/ansible-operator)
   - [quay.io/operator-framework/helm-operator](https://quay.io/repository/operator-framework/helm-operator)
 
-### Deprecated
-
-### Removed
-
 ### Bug Fixes
 
 - Fixes deadlocks during operator deployment rollouts, which were caused by operator pods requiring a leader election lock to become ready ([#932](https://github.com/operator-framework/operator-sdk/pull/932))

diff --git a/pkg/scaffold/ansible/gopkgtoml.go b/pkg/scaffold/ansible/gopkgtoml.go
@@ -35,8 +35,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.4.0" #osdk_version_annotation
+  branch = "master" #osdk_branch_annotation
+  # version = "=v0.4.0" #osdk_version_annotation
 
 [[override]]
   name = "k8s.io/api"

diff --git a/pkg/scaffold/gopkgtoml.go b/pkg/scaffold/gopkgtoml.go
@@ -89,8 +89,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.4.0" #osdk_version_annotation
+  branch = "master" #osdk_branch_annotation
+  # version = "=v0.4.0" #osdk_version_annotation
 
 [prune]
   go-tests = true

diff --git a/pkg/scaffold/gopkgtoml_test.go b/pkg/scaffold/gopkgtoml_test.go
@@ -81,8 +81,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.4.0" #osdk_version_annotation
+  branch = "master" #osdk_branch_annotation
+  # version = "=v0.4.0" #osdk_version_annotation
 
 [prune]
   go-tests = true

diff --git a/pkg/scaffold/helm/gopkgtoml.go b/pkg/scaffold/helm/gopkgtoml.go
@@ -35,8 +35,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.4.0" #osdk_version_annotation
+  branch = "master" #osdk_branch_annotation
+  # version = "=v0.4.0" #osdk_version_annotation
 
 [[override]]
   name = "k8s.io/kubernetes"

diff --git a/version/version.go b/version/version.go
@@ -15,5 +15,5 @@
 package version
 
 var (
-	Version = "v0.4.0"
+	Version = "v0.4.0+git"
 )