Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Condense README sections #673

Merged

Conversation

Bubblemelon
Copy link
Contributor

Related PR #671

See @hoegaarden 's suggestions.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 2, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @Bubblemelon. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added area/release-eng Issues or PRs related to the Release Engineering subproject sig/release Categorizes an issue or PR as relevant to SIG Release. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 2, 2019
Copy link
Contributor Author

@Bubblemelon Bubblemelon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The one suggestion that I didn't apply to this change is adding the sentence about stage, release, announce. I believe this process is quite evident in the Branch Manager Handbook.

README.md Outdated
[`branchff`](https://github.com/kubernetes/release/blob/master/branchff) | Fast-forward branching helper : <br/><br/> A tool used to pull new patches onto the release branch.
<br/> [`find_green_build`](https://github.com/kubernetes/release/blob/master/find_green_build) <br/><br/> | Asks Jenkins for a good build to use.
<br/> [`release-notes`](https://github.com/kubernetes/release/blob/master/cmd/release-notes) <br/><br/> | Scrape GitHub for release notes. See [Release Notes Gathering](#release-notes-gathering) for more information.
<br/> [`prin`](https://github.com/kubernetes/release/blob/master/prin) <br/><br/> | What tags/releases is my PR IN?
Copy link
Contributor Author

@Bubblemelon Bubblemelon Mar 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I verbosely copied this over from the old README. Does this simply mean, "To show tags/releases that a PR is in." ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.

E.g. when I am in the directory of the k8s source and call the script with a random PR number or a random commit hash, it shows which tags those PR/commit is included in. However, I have never ever used that script before.

user@b3a1b221edab:/usr/local/google/branchff-release-1.12/src/k8s.io/kubernetes$ /src/prin '69500'
Skipping security_layer::hosted_map extensions...

COMMITS: 3f102c3980 (initial)  (cherrypicks)
(https://github.com/kubernetes/kubernetes/pull/69500)

                LATENCY TO APPEAR (DAYS)
TAG             K8S
---             ---
v1.13.0         49.22
v1.13.0-alpha.1 3.10
v1.13.0-alpha.2 11.62
v1.13.0-alpha.3 18.57
v1.13.0-beta.0  26.01
v1.13.0-beta.1  35.42
v1.13.0-beta.2  41.26
v1.13.0-rc.1    46.32
v1.13.0-rc.2    47.36
v1.13.1         60.78
v1.13.1-beta.0  52.10
v1.13.2         88.56
v1.13.2-beta.0  61.67
v1.13.3         111.97
v1.13.3-beta.0  90.21
v1.13.4         137.53
v1.13.4-beta.0  112.06
v1.13.5-beta.0  138.79
v1.14.0-alpha.0 25.94
v1.14.0-alpha.1 94.68
v1.14.0-alpha.2 108.62
v1.14.0-alpha.3 122.58
v1.14.0-beta.0  129.81
v1.14.0-beta.1  136.64
v1.15.0-alpha.0 129.77

user@b3a1b221edab:/usr/local/google/branchff-release-1.12/src/k8s.io/kubernetes$ /src/prin '3f102c3980'
Skipping security_layer::hosted_map extensions...

COMMITS: 3f102c3980 (initial)  (cherrypicks)

                LATENCY TO APPEAR (DAYS)
TAG             K8S
---             ---
v1.13.0         49.22
v1.13.0-alpha.1 3.10
v1.13.0-alpha.2 11.62
v1.13.0-alpha.3 18.57
v1.13.0-beta.0  26.01
v1.13.0-beta.1  35.42
v1.13.0-beta.2  41.26
v1.13.0-rc.1    46.32
v1.13.0-rc.2    47.36
v1.13.1         60.78
v1.13.1-beta.0  52.10
v1.13.2         88.56
v1.13.2-beta.0  61.67
v1.13.3         111.97
v1.13.3-beta.0  90.21
v1.13.4         137.53
v1.13.4-beta.0  112.06
v1.13.5-beta.0  138.79
v1.14.0-alpha.0 25.94
v1.14.0-alpha.1 94.68
v1.14.0-alpha.2 108.62
v1.14.0-alpha.3 122.58
v1.14.0-beta.0  129.81
v1.14.0-beta.1  136.64
v1.15.0-alpha.0 129.77

user@b3a1b221edab:/usr/local/google/branchff-release-1.12/src/k8s.io/kubernetes$

README.md Outdated
<br/> [`release-notes`](https://github.com/kubernetes/release/blob/master/cmd/release-notes) <br/><br/> | Scrape GitHub for release notes. See [Release Notes Gathering](#release-notes-gathering) for more information.
<br/> [`prin`](https://github.com/kubernetes/release/blob/master/prin) <br/><br/> | What tags/releases is my PR IN?
<br/> [`changelog-update`](https://github.com/kubernetes/release/blob/master/changelog-update) <br/><br/> | Updates [CHANGELOG.md](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG.md) version entries by rescanning github for text and label changes.
<br/> [`push-build.sh`](https://github.com/kubernetes/release/blob/master/push-build.sh) <br/><br/> | Pushes a developer (or CI) build up to GCS.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one was also verbosely copied over, does CI mean the CI-Signal team?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"CI" in this context probably means "the CI system". In the description of the script they e.g. talk about jenkins, which as far as I know was the precursor of prow. I have never used that script and consider it outdated.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh okay, I get it now. I completely misinterpreted what that sentence meant, looking at push-build.sh when the sentence says, "developer" it actually means developer build and CI for Jenkins continuous builds ( exactly what you've pointed out 😅 ).

@hoegaarden
Copy link
Contributor

/assign

Copy link
Contributor

@hoegaarden hoegaarden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for doing this! I just found one litte typo ...

README.md Outdated
<br/> [`push-build.sh`](https://github.com/kubernetes/release/blob/master/push-build.sh) <br/><br/> | Pushes a developer (or CI) build up to GCS.
<br/> [`script-template`](https://github.com/kubernetes/release/blob/master/script-template) <br/><br/> | Generates a script template in the kubernetes/release ecosystem.

For information on how to use `gcbmgr`, `anago` and `branchoff`, see the [Branch Manager Handbook](https://github.com/kubernetes/sig-release/tree/master/release-team/role-handbooks/branch-manager#branch-manager-handbook)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
For information on how to use `gcbmgr`, `anago` and `branchoff`, see the [Branch Manager Handbook](https://github.com/kubernetes/sig-release/tree/master/release-team/role-handbooks/branch-manager#branch-manager-handbook)
For information on how to use `gcbmgr`, `anago` and `branchff`, see the [Branch Manager Handbook](https://github.com/kubernetes/sig-release/tree/master/release-team/role-handbooks/branch-manager#branch-manager-handbook).

branchff stands for "branch fast forward"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ohh typo! Thanks for catching that! 😊

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you'd quickly fix that (either by accepting this suggestion or pushing a commit which fixes that) we can get this whole PR merged. Let me know, if you need help!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done! 😅

README.md Outdated
[`branchff`](https://github.com/kubernetes/release/blob/master/branchff) | Fast-forward branching helper : <br/><br/> A tool used to pull new patches onto the release branch.
<br/> [`find_green_build`](https://github.com/kubernetes/release/blob/master/find_green_build) <br/><br/> | Asks Jenkins for a good build to use.
<br/> [`release-notes`](https://github.com/kubernetes/release/blob/master/cmd/release-notes) <br/><br/> | Scrape GitHub for release notes. See [Release Notes Gathering](#release-notes-gathering) for more information.
<br/> [`prin`](https://github.com/kubernetes/release/blob/master/prin) <br/><br/> | What tags/releases is my PR IN?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.

E.g. when I am in the directory of the k8s source and call the script with a random PR number or a random commit hash, it shows which tags those PR/commit is included in. However, I have never ever used that script before.

user@b3a1b221edab:/usr/local/google/branchff-release-1.12/src/k8s.io/kubernetes$ /src/prin '69500'
Skipping security_layer::hosted_map extensions...

COMMITS: 3f102c3980 (initial)  (cherrypicks)
(https://github.com/kubernetes/kubernetes/pull/69500)

                LATENCY TO APPEAR (DAYS)
TAG             K8S
---             ---
v1.13.0         49.22
v1.13.0-alpha.1 3.10
v1.13.0-alpha.2 11.62
v1.13.0-alpha.3 18.57
v1.13.0-beta.0  26.01
v1.13.0-beta.1  35.42
v1.13.0-beta.2  41.26
v1.13.0-rc.1    46.32
v1.13.0-rc.2    47.36
v1.13.1         60.78
v1.13.1-beta.0  52.10
v1.13.2         88.56
v1.13.2-beta.0  61.67
v1.13.3         111.97
v1.13.3-beta.0  90.21
v1.13.4         137.53
v1.13.4-beta.0  112.06
v1.13.5-beta.0  138.79
v1.14.0-alpha.0 25.94
v1.14.0-alpha.1 94.68
v1.14.0-alpha.2 108.62
v1.14.0-alpha.3 122.58
v1.14.0-beta.0  129.81
v1.14.0-beta.1  136.64
v1.15.0-alpha.0 129.77

user@b3a1b221edab:/usr/local/google/branchff-release-1.12/src/k8s.io/kubernetes$ /src/prin '3f102c3980'
Skipping security_layer::hosted_map extensions...

COMMITS: 3f102c3980 (initial)  (cherrypicks)

                LATENCY TO APPEAR (DAYS)
TAG             K8S
---             ---
v1.13.0         49.22
v1.13.0-alpha.1 3.10
v1.13.0-alpha.2 11.62
v1.13.0-alpha.3 18.57
v1.13.0-beta.0  26.01
v1.13.0-beta.1  35.42
v1.13.0-beta.2  41.26
v1.13.0-rc.1    46.32
v1.13.0-rc.2    47.36
v1.13.1         60.78
v1.13.1-beta.0  52.10
v1.13.2         88.56
v1.13.2-beta.0  61.67
v1.13.3         111.97
v1.13.3-beta.0  90.21
v1.13.4         137.53
v1.13.4-beta.0  112.06
v1.13.5-beta.0  138.79
v1.14.0-alpha.0 25.94
v1.14.0-alpha.1 94.68
v1.14.0-alpha.2 108.62
v1.14.0-alpha.3 122.58
v1.14.0-beta.0  129.81
v1.14.0-beta.1  136.64
v1.15.0-alpha.0 129.77

user@b3a1b221edab:/usr/local/google/branchff-release-1.12/src/k8s.io/kubernetes$

README.md Outdated
<br/> [`release-notes`](https://github.com/kubernetes/release/blob/master/cmd/release-notes) <br/><br/> | Scrape GitHub for release notes. See [Release Notes Gathering](#release-notes-gathering) for more information.
<br/> [`prin`](https://github.com/kubernetes/release/blob/master/prin) <br/><br/> | What tags/releases is my PR IN?
<br/> [`changelog-update`](https://github.com/kubernetes/release/blob/master/changelog-update) <br/><br/> | Updates [CHANGELOG.md](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG.md) version entries by rescanning github for text and label changes.
<br/> [`push-build.sh`](https://github.com/kubernetes/release/blob/master/push-build.sh) <br/><br/> | Pushes a developer (or CI) build up to GCS.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"CI" in this context probably means "the CI system". In the description of the script they e.g. talk about jenkins, which as far as I know was the precursor of prow. I have never used that script and consider it outdated.

Combines Primary Tools and All Tools, and also
removes Common Workflows.
@hoegaarden
Copy link
Contributor

/lgtm
/ok-to-test

/hold
... for a bit, to maybe get another pair of eyes on it.
/assign @dougm @tpepper

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Mar 4, 2019
@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 4, 2019
Copy link
Member

@dougm dougm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@hoegaarden could be that push-build.sh is obsolete, but if so can address that in a separate PR. It uses the same releaselib functions as anago, looks like push-build.sh could still be used to push developer builds to bucket/registry/etc. other than the release targets. But I haven't used it either.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Bubblemelon, dougm, hoegaarden

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@hoegaarden
Copy link
Contributor

Thanks @dougm ... will probably check on deprecating some tools in a separate PR.

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 5, 2019
@k8s-ci-robot k8s-ci-robot merged commit fa05467 into kubernetes:master Mar 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/release-eng Issues or PRs related to the Release Engineering subproject cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. sig/release Categorizes an issue or PR as relevant to SIG Release. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants