Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## Unreleased

### Added

### Changed

### Deprecated

### Removed

### Bug Fixes

## v0.10.0

### Added
Expand Down
4 changes: 1 addition & 3 deletions internal/pkg/scaffold/ansible/go_mod.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions internal/pkg/scaffold/ansible/gopkgtoml.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 1 addition & 3 deletions internal/pkg/scaffold/go_mod.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions internal/pkg/scaffold/gopkgtoml.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions internal/pkg/scaffold/helm/go_mod.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions internal/pkg/scaffold/helm/gopkgtoml.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package version

var (
Version = "v0.10.0"
Version = "v0.10.0+git"
GitVersion = "unknown"
GitCommit = "unknown"
)