Skip to content

Commit e27fd87

Browse files
committed
doc/*: updates from PR feedback
1 parent 39d8fce commit e27fd87

File tree

2 files changed

+1
-34
lines changed

2 files changed

+1
-34
lines changed

doc/dev/release.md

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,6 @@ $ git checkout -b release-v1.3.0
196196
Commit the following changes:
197197
198198
- `version/version.go`: update `Version` to `v1.3.0`.
199-
- `internal/pkg/scaffold/gopkgtoml.go`, under the `[[constraint]]` for `github.com/operator-framework/operator-sdk`:
200-
- Comment out `branch = "master"`
201-
- Un-comment `version = "v1.2.0"`
202-
- Change `v1.2.0` to `v1.3.0`
203-
- `internal/pkg/scaffold/ansible/gopkgtoml.go`: same as for `internal/pkg/scaffold/gopkgtoml.go`.
204-
- `internal/pkg/scaffold/helm/gopkgtoml.go`: same as for `internal/pkg/scaffold/gopkgtoml.go`.
205199
- `internal/pkg/scaffold/go_mod.go`, in the `replace` block for `github.com/operator-framework/operator-sdk`:
206200
- Add the following `replace` line to the bottom of `go.mod`: `replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v1.3.0`.
207201
- If a `replace` line already exists, change the version to `v1.3.0`.
@@ -243,11 +237,6 @@ Once this tag passes CI, go to step 3. For more info on tagging, see the [releas
243237
Check out a new branch from master (or use your `release-v1.3.0` branch) and commit the following changes:
244238
245239
- `version/version.go`: update `Version` to `v1.3.0+git`.
246-
- `internal/pkg/scaffold/gopkgtoml.go`, under the `[[constraint]]` for `github.com/operator-framework/operator-sdk`:
247-
- Comment out `version = "v1.3.0"`
248-
- Un-comment `branch = "master"`
249-
- `internal/pkg/scaffold/ansible/gopkgtoml.go`: same as for `internal/pkg/scaffold/gopkgtoml.go`.
250-
- `internal/pkg/scaffold/helm/gopkgtoml.go`: same as for `internal/pkg/scaffold/gopkgtoml.go`.
251240
- `internal/pkg/scaffold/go_mod.go`, in the `replace` block for `github.com/operator-framework/operator-sdk`:
252241
- Remove the `replace` line at the bottom of `go.mod`: `replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v1.3.0`.
253242
- `internal/pkg/scaffold/helm/go_mod.go`: same as for `internal/pkg/scaffold/go_mod.go`.
@@ -298,7 +287,7 @@ To github.com:operator-framework/operator-sdk.git
298287
* [new branch] v1.3.x -> v1.3.x
299288
```
300289
301-
Now that the branch exists, you need to make the post-release PR for the new release branch. To do this, simply follow the same steps as in [step 3](#3-create-a-pr-for-post-release-version-and-changelogmd-updates) with the addition of changing the branch name in the `gopkgtoml` scaffold from `master` to the new branch (for example, `v1.3.x`). Then, make the PR against the new branch.
290+
Now that the branch exists, you need to make the post-release PR for the new release branch. To do this, simply follow the same steps as in [step 3](#3-create-a-pr-for-post-release-version-and-changelogmd-updates) with the addition of changing the branch name in the `go.mod` scaffold from `master` to the new branch (for example, `v1.3.x`). Then, make the PR against the new branch.
302291
303292
### 6. Updating the Homebrew formula
304293

doc/sdk-cli-reference.md

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -91,28 +91,6 @@ Prints the most recent Golang packages and versions required by operators. Print
9191

9292
### Example
9393

94-
With dependency manager `dep`:
95-
96-
```console
97-
$ operator-sdk print-deps
98-
required = [
99-
"k8s.io/code-generator/cmd/deepcopy-gen",
100-
"k8s.io/code-generator/cmd/conversion-gen",
101-
"k8s.io/code-generator/cmd/client-gen",
102-
"k8s.io/code-generator/cmd/lister-gen",
103-
"k8s.io/code-generator/cmd/informer-gen",
104-
"k8s.io/code-generator/cmd/openapi-gen",
105-
"k8s.io/gengo/args",
106-
]
107-
108-
[[override]]
109-
name = "k8s.io/code-generator"
110-
revision = "6702109cc68eb6fe6350b83e14407c8d7309fd1a"
111-
...
112-
```
113-
114-
With dependency manager Go `modules`:
115-
11694
```console
11795
$ operator-sdk print-deps
11896
module github.com/example-inc/memcached-operator

0 commit comments

Comments
 (0)