Skip to content

Commit 95f2c1d

Browse files
authored
*: bump to v0.10.0+git (#1805)
1 parent ff80b17 commit 95f2c1d

File tree

8 files changed

+22
-16
lines changed

8 files changed

+22
-16
lines changed

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
## Unreleased
2+
3+
### Added
4+
5+
### Changed
6+
7+
### Deprecated
8+
9+
### Removed
10+
11+
### Bug Fixes
12+
113
## v0.10.0
214

315
### Added

internal/pkg/scaffold/ansible/go_mod.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const goModTmpl = `module {{ .Repo }}
4141
require (
4242
github.com/NYTimes/gziphandler v1.0.1 // indirect
4343
github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
44-
github.com/operator-framework/operator-sdk master
44+
github.com/operator-framework/operator-sdk v0.10.x
4545
github.com/spf13/pflag v1.0.3
4646
k8s.io/apiextensions-apiserver v0.0.0-20190328030136-8ada4fd07db4
4747
k8s.io/client-go v11.0.0+incompatible
@@ -65,8 +65,6 @@ replace (
6565
// resolve it correctly.
6666
github.com/prometheus/prometheus => github.com/prometheus/prometheus d3245f15022551c6fc8281766ea62db4d71e2747
6767
)
68-
69-
replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.10.0
7068
`
7169

7270
func PrintGoMod(asFile bool) error {

internal/pkg/scaffold/ansible/gopkgtoml.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ func (s *GopkgToml) GetInput() (input.Input, error) {
3838
const gopkgTomlTmpl = `[[constraint]]
3939
name = "github.com/operator-framework/operator-sdk"
4040
# The version rule is used for a specific release and the master branch for in between releases.
41-
# branch = "master" #osdk_branch_annotation
42-
version = "=v0.10.0" #osdk_version_annotation
41+
branch = "v0.10.x" #osdk_branch_annotation
42+
# version = "=v0.10.0" #osdk_version_annotation
4343
4444
[[override]]
4545
name = "k8s.io/api"

internal/pkg/scaffold/go_mod.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const goModTmpl = `module {{ .Repo }}
3939
4040
require (
4141
github.com/NYTimes/gziphandler v1.0.1 // indirect
42-
github.com/operator-framework/operator-sdk master
42+
github.com/operator-framework/operator-sdk v0.10.x
4343
github.com/spf13/pflag v1.0.3
4444
k8s.io/api v0.0.0-20190612125737-db0771252981
4545
k8s.io/apimachinery v0.0.0-20190612125636-6a5db36e93ad
@@ -66,8 +66,6 @@ replace (
6666
// resolve it correctly.
6767
github.com/prometheus/prometheus => github.com/prometheus/prometheus d3245f15022551c6fc8281766ea62db4d71e2747
6868
)
69-
70-
replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.10.0
7169
`
7270

7371
func PrintGoMod(asFile bool) error {

internal/pkg/scaffold/gopkgtoml.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ required = [
8383
[[constraint]]
8484
name = "github.com/operator-framework/operator-sdk"
8585
# The version rule is used for a specific release and the master branch for in between releases.
86-
# branch = "master" #osdk_branch_annotation
87-
version = "=v0.10.0" #osdk_version_annotation
86+
branch = "v0.10.x" #osdk_branch_annotation
87+
# version = "=v0.10.0" #osdk_version_annotation
8888
8989
[prune]
9090
go-tests = true

internal/pkg/scaffold/helm/go_mod.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ require (
4242
github.com/NYTimes/gziphandler v1.0.1 // indirect
4343
github.com/coreos/etcd v3.3.12+incompatible // indirect
4444
github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
45-
github.com/operator-framework/operator-sdk master
45+
github.com/operator-framework/operator-sdk v0.10.x
4646
github.com/spf13/pflag v1.0.3
4747
github.com/ugorji/go/codec v0.0.0-20190320090025-2dc34c0b8780 // indirect
4848
k8s.io/apiextensions-apiserver v0.0.0-20190228180357-d002e88f6236
@@ -69,8 +69,6 @@ replace (
6969
// resolve it correctly.
7070
github.com/prometheus/prometheus => github.com/prometheus/prometheus d3245f15022551c6fc8281766ea62db4d71e2747
7171
)
72-
73-
replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.10.0
7472
`
7573

7674
func PrintGoMod(asFile bool) error {

internal/pkg/scaffold/helm/gopkgtoml.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ func (s *GopkgToml) GetInput() (input.Input, error) {
3838
const gopkgTomlTmpl = `[[constraint]]
3939
name = "github.com/operator-framework/operator-sdk"
4040
# The version rule is used for a specific release and the master branch for in between releases.
41-
# branch = "master" #osdk_branch_annotation
42-
version = "=v0.10.0" #osdk_version_annotation
41+
branch = "v0.10.x" #osdk_branch_annotation
42+
# version = "=v0.10.0" #osdk_version_annotation
4343
4444
[[override]]
4545
name = "k8s.io/api"

version/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package version
1616

1717
var (
18-
Version = "v0.10.0"
18+
Version = "v0.10.0+git"
1919
GitVersion = "unknown"
2020
GitCommit = "unknown"
2121
)

0 commit comments

Comments
 (0)