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
4 changes: 1 addition & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Unreleased
## v0.11.0

### Added

Expand Down Expand Up @@ -54,8 +54,6 @@
- Upgrade Python version from `2.7` to `3.6`, Ansible version from `2.8.0` to `~=2.8` and ansible-runner from `1.2` to `1.3.4` in the Ansible based images. ([#1947](https://github.com/operator-framework/operator-sdk/pull/1947))
- Replaced `pkg/kube-metrics.NewCollectors()` with `pkg/kube-metrics.NewMetricsStores()` and changed exported function signature for `pkg/kube-metrics.ServeMetrics()` due to a [breaking change in kube-state-metrics](https://github.com/kubernetes/kube-state-metrics/pull/786). ([#1943](https://github.com/operator-framework/operator-sdk/pull/1943))

### Deprecated

### Removed

- Removed flag `--as-file` from command [`operator-sdk print-deps`](https://github.com/operator-framework/operator-sdk/blob/master/doc/sdk-cli-reference.md#print-deps), which now only prints packages and versions in dependency manager file format. The choice of dependency manager type is set by `--dep-manager` or inferred from top-level dependency manager files present if `--dep-manager` is not set. ([#1819](https://github.com/operator-framework/operator-sdk/pull/1819))
Expand Down
2 changes: 1 addition & 1 deletion doc/user/install-operator-sdk.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $ brew install operator-sdk

```sh
# Set the release version variable
$ RELEASE_VERSION=v0.10.0
$ RELEASE_VERSION=v0.11.0
# Linux
$ curl -LO https://github.com/operator-framework/operator-sdk/releases/download/${RELEASE_VERSION}/operator-sdk-${RELEASE_VERSION}-x86_64-linux-gnu
# macOS
Expand Down
2 changes: 2 additions & 0 deletions internal/pkg/scaffold/ansible/go_mod.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ replace (
// resolve it correctly.
github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286
)

replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.11.0
`

func PrintGoMod() 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 @@ -37,8 +37,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 = "master" #osdk_branch_annotation
version = "=v0.11.0" #osdk_version_annotation

[[override]]
name = "k8s.io/api"
Expand Down
2 changes: 2 additions & 0 deletions internal/pkg/scaffold/go_mod.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ replace (
// resolve it correctly.
github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286
)

replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.11.0
`

func PrintGoMod() 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 @@ -74,8 +74,8 @@ const gopkgTomlTmpl = `[[override]]
[[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 = "master" #osdk_branch_annotation
version = "=v0.11.0" #osdk_version_annotation

[prune]
go-tests = true
Expand Down
2 changes: 2 additions & 0 deletions internal/pkg/scaffold/helm/go_mod.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ replace (
// resolve it correctly.
github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286
)

replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.11.0
`

func PrintGoMod() 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 @@ -37,8 +37,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 = "master" #osdk_branch_annotation
version = "=v0.11.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 @@ -20,7 +20,7 @@ import (
)

var (
Version = "v0.10.0+git"
Version = "v0.11.0"
GitVersion = "unknown"
GitCommit = "unknown"
GoVersion = fmt.Sprintf("%s %s/%s", runtime.Version(), runtime.GOOS, runtime.GOARCH)
Expand Down