Skip to content

Commit 605cbf8

Browse files
authored
*: bump v0.8.x branch to v0.8.0+git (#1448)
1 parent 78c4724 commit 605cbf8

File tree

10 files changed

+25
-17
lines changed

10 files changed

+25
-17
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.8.0
214

315
### Added

internal/pkg/scaffold/ansible/go_mod.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ require (
6464
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6565
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
6666
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
67-
github.com/operator-framework/operator-sdk master
67+
github.com/operator-framework/operator-sdk v0.8.x
6868
github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709 // indirect
6969
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
7070
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 // indirect
@@ -109,7 +109,6 @@ replace (
109109
github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.29.0
110110
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20181117043124-c2090bec4d9b
111111
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.0
113112
)
114113
`
115114

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.8.0" #osdk_version_annotation
41+
branch = "v0.8.x" #osdk_branch_annotation
42+
# version = "=v0.8.0" #osdk_version_annotation
4343
4444
[[override]]
4545
name = "k8s.io/api"

internal/pkg/scaffold/go_mod.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ require (
5656
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
5757
github.com/grpc-ecosystem/grpc-gateway v1.8.5 // indirect
5858
github.com/imdario/mergo v0.3.6 // indirect
59-
github.com/operator-framework/operator-sdk master
59+
github.com/operator-framework/operator-sdk v0.8.x
6060
github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709 // indirect
6161
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
6262
github.com/spf13/pflag v1.0.3
@@ -89,7 +89,6 @@ replace (
8989
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180711000925-0cf8f7e6ed1d
9090
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.1.10
9191
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.0
9392
)
9493
`
9594

internal/pkg/scaffold/go_mod_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ require (
5757
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
5858
github.com/grpc-ecosystem/grpc-gateway v1.8.5 // indirect
5959
github.com/imdario/mergo v0.3.6 // indirect
60-
github.com/operator-framework/operator-sdk master
60+
github.com/operator-framework/operator-sdk v0.8.x
6161
github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709 // indirect
6262
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
6363
github.com/spf13/pflag v1.0.3
@@ -90,6 +90,5 @@ replace (
9090
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180711000925-0cf8f7e6ed1d
9191
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.1.10
9292
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.0
9493
)
9594
`

internal/pkg/scaffold/gopkgtoml.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ required = [
9595
[[constraint]]
9696
name = "github.com/operator-framework/operator-sdk"
9797
# The version rule is used for a specific release and the master branch for in between releases.
98-
# branch = "master" #osdk_branch_annotation
99-
version = "=v0.8.0" #osdk_version_annotation
98+
branch = "v0.8.x" #osdk_branch_annotation
99+
# version = "=v0.8.0" #osdk_version_annotation
100100
101101
[prune]
102102
go-tests = true

internal/pkg/scaffold/gopkgtoml_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ required = [
9393
[[constraint]]
9494
name = "github.com/operator-framework/operator-sdk"
9595
# The version rule is used for a specific release and the master branch for in between releases.
96-
# branch = "master" #osdk_branch_annotation
97-
version = "=v0.8.0" #osdk_version_annotation
96+
branch = "v0.8.x" #osdk_branch_annotation
97+
# version = "=v0.8.0" #osdk_version_annotation
9898
9999
[prune]
100100
go-tests = true

internal/pkg/scaffold/helm/go_mod.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ require (
9999
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
100100
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
101101
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
102-
github.com/operator-framework/operator-sdk master
102+
github.com/operator-framework/operator-sdk v0.8.x
103103
github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709 // indirect
104104
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
105105
github.com/pkg/errors v0.8.1 // indirect
@@ -165,7 +165,6 @@ replace (
165165
replace (
166166
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20181117043124-c2090bec4d9b
167167
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.0
169168
)
170169
`
171170

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.8.0" #osdk_version_annotation
41+
branch = "v0.8.x" #osdk_branch_annotation
42+
# version = "=v0.8.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.8.0"
18+
Version = "v0.8.0+git"
1919
GitVersion = "unknown"
2020
GitCommit = "unknown"
2121
)

0 commit comments

Comments
 (0)