CHANGELOG,version,scaffold: post-release version bump (operator-frame…

…work#1295)
nate-duke · Apr 5, 2019 · cd9a38e · cd9a38e
1 parent 7e07b20
commit cd9a38e
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.7.0
 
 ### Added
@@ -12,10 +24,6 @@
 - Subcommands of [`operator-sdk generate`](https://github.com/operator-framework/operator-sdk/blob/master/doc/sdk-cli-reference.md#generate) are now verbose by default. ([#1271](https://github.com/operator-framework/operator-sdk/pull/1271))
 - [`operator-sdk olm-catalog gen-csv`](https://github.com/operator-framework/operator-sdk/blob/master/doc/sdk-cli-reference.md#gen-csv) parses Custom Resource manifests from `deploy/crds` or a custom path specified in `csv-config.yaml`, encodes them in a JSON array, and sets the CSV's [`metadata.annotations.alm-examples`](https://github.com/operator-framework/operator-lifecycle-manager/blob/master/Documentation/design/building-your-csv.md#crd-templates) field to that JSON. ([#1116](https://github.com/operator-framework/operator-sdk/pull/1116))
 
-### Deprecated
-
-### Removed
-
 ### Bug Fixes
 
 - Fixed an issue that caused `operator-sdk new --type=helm` to fail for charts that have template files in nested template directories. ([#1235](https://github.com/operator-framework/operator-sdk/pull/1235))

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

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

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

diff --git a/internal/pkg/scaffold/helm/gopkgtoml.go b/internal/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.7.0" #osdk_version_annotation
+  branch = "master" #osdk_branch_annotation
+  # version = "=v0.7.0" #osdk_version_annotation
 
 [[override]]
   name = "k8s.io/api"

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