From 4fb4c60179eebf3f3a53d144d69fc00786d13d38 Mon Sep 17 00:00:00 2001 From: Joe Lanford Date: Thu, 8 Aug 2019 16:23:13 -0400 Subject: [PATCH] *: bump to v0.10.0+git --- CHANGELOG.md | 12 ++++++++++++ internal/pkg/scaffold/ansible/go_mod.go | 4 +--- internal/pkg/scaffold/ansible/gopkgtoml.go | 4 ++-- internal/pkg/scaffold/go_mod.go | 4 +--- internal/pkg/scaffold/gopkgtoml.go | 4 ++-- internal/pkg/scaffold/helm/go_mod.go | 4 +--- internal/pkg/scaffold/helm/gopkgtoml.go | 4 ++-- version/version.go | 2 +- 8 files changed, 22 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61713a7ba4b..6d10fd1367e 100644 --- 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 index 2c63d5b77a3..c858fb0789f 100644 --- a/internal/pkg/scaffold/ansible/go_mod.go +++ b/internal/pkg/scaffold/ansible/go_mod.go @@ -41,7 +41,7 @@ const goModTmpl = `module {{ .Repo }} require ( github.com/NYTimes/gziphandler v1.0.1 // indirect github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect - github.com/operator-framework/operator-sdk master + github.com/operator-framework/operator-sdk v0.10.x github.com/spf13/pflag v1.0.3 k8s.io/apiextensions-apiserver v0.0.0-20190328030136-8ada4fd07db4 k8s.io/client-go v11.0.0+incompatible @@ -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 index 846e6e5f525..d26a2f0a14c 100644 --- 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 = "v0.10.x" #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 index b4128745faf..9b9a6bba5fe 100644 --- a/internal/pkg/scaffold/go_mod.go +++ b/internal/pkg/scaffold/go_mod.go @@ -39,7 +39,7 @@ const goModTmpl = `module {{ .Repo }} require ( github.com/NYTimes/gziphandler v1.0.1 // indirect - github.com/operator-framework/operator-sdk master + github.com/operator-framework/operator-sdk v0.10.x github.com/spf13/pflag v1.0.3 k8s.io/api v0.0.0-20190612125737-db0771252981 k8s.io/apimachinery v0.0.0-20190612125636-6a5db36e93ad @@ -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 index cdcee82484c..17cc7ef773a 100644 --- 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 = "v0.10.x" #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 index 7b76e3f164c..7618f020527 100644 --- a/internal/pkg/scaffold/helm/go_mod.go +++ b/internal/pkg/scaffold/helm/go_mod.go @@ -42,7 +42,7 @@ require ( github.com/NYTimes/gziphandler v1.0.1 // indirect github.com/coreos/etcd v3.3.12+incompatible // indirect github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect - github.com/operator-framework/operator-sdk master + github.com/operator-framework/operator-sdk v0.10.x github.com/spf13/pflag v1.0.3 github.com/ugorji/go/codec v0.0.0-20190320090025-2dc34c0b8780 // indirect k8s.io/apiextensions-apiserver v0.0.0-20190228180357-d002e88f6236 @@ -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 index c3e02b3322d..e41ca71e2dc 100644 --- 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 = "v0.10.x" #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 index e5879a11574..10da70f104d 100644 --- 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" )