Skip to content

Commit 40b8138

Browse files
authored
Revert "*: release v0.11.0 (#2034)" (#2043)
This reverts commit c1cc17e.
1 parent c1cc17e commit 40b8138

File tree

9 files changed

+11
-15
lines changed

9 files changed

+11
-15
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## v0.11.0
1+
## Unreleased
22

33
### Added
44

@@ -53,6 +53,8 @@
5353
- 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))
5454
- 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))
5555

56+
### Deprecated
57+
5658
### Removed
5759

5860
- 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))

doc/user/install-operator-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $ brew install operator-sdk
1818

1919
```sh
2020
# Set the release version variable
21-
$ RELEASE_VERSION=v0.11.0
21+
$ RELEASE_VERSION=v0.10.0
2222
# Linux
2323
$ curl -LO https://github.com/operator-framework/operator-sdk/releases/download/${RELEASE_VERSION}/operator-sdk-${RELEASE_VERSION}-x86_64-linux-gnu
2424
# macOS

internal/pkg/scaffold/ansible/go_mod.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ replace (
6666
// resolve it correctly.
6767
github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286
6868
)
69-
70-
replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.11.0
7169
`
7270

7371
func PrintGoMod() error {

internal/pkg/scaffold/ansible/gopkgtoml.go

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

internal/pkg/scaffold/go_mod.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ replace (
6565
// resolve it correctly.
6666
github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286
6767
)
68-
69-
replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.11.0
7068
`
7169

7270
func PrintGoMod() error {

internal/pkg/scaffold/gopkgtoml.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ const gopkgTomlTmpl = `[[override]]
7474
[[constraint]]
7575
name = "github.com/operator-framework/operator-sdk"
7676
# The version rule is used for a specific release and the master branch for in between releases.
77-
# branch = "master" #osdk_branch_annotation
78-
version = "=v0.11.0" #osdk_version_annotation
77+
branch = "master" #osdk_branch_annotation
78+
# version = "=v0.10.0" #osdk_version_annotation
7979
8080
[prune]
8181
go-tests = true

internal/pkg/scaffold/helm/go_mod.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ replace (
8787
// resolve it correctly.
8888
github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286
8989
)
90-
91-
replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.11.0
9290
`
9391

9492
func PrintGoMod() error {

internal/pkg/scaffold/helm/gopkgtoml.go

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

version/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
)
2121

2222
var (
23-
Version = "v0.11.0"
23+
Version = "v0.10.0+git"
2424
GitVersion = "unknown"
2525
GitCommit = "unknown"
2626
GoVersion = fmt.Sprintf("%s %s/%s", runtime.Version(), runtime.GOOS, runtime.GOARCH)

0 commit comments

Comments
 (0)