Skip to content

Fix release notes for v18.17.0a1 and v17.14.0a1 in release-18.0 branch #1425

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

Merged

Conversation

roycaihw
Copy link
Member

@roycaihw roycaihw commented Apr 22, 2021

What type of PR is this?

/kind documentation

What this PR does / why we need it:

Merge the two section # v18 and # v18.0.0-snapshot into # v18.17.0a1. Rename "17.0.0-snapshot" into "v17.14.0a1" in sync with the master branch.

Does this PR introduce a user-facing change?

NONE

/cc @yliaog

@k8s-ci-robot k8s-ci-robot requested a review from yliaog April 22, 2021 21:49
@k8s-ci-robot k8s-ci-robot added kind/documentation Categorizes issue or PR as related to documentation. release-note-none Denotes a PR that doesn't merit a release note. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Apr 22, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: roycaihw

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

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 22, 2021


# v18.0.0-snapshot
Copy link
Contributor

Choose a reason for hiding this comment

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

so there is no snapshot? i noticed 1.17 below still stay at snapshot

Copy link
Member Author

Choose a reason for hiding this comment

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

Cherry-picked #1322 (just merged into master today) to rename the 1.17 snapshot.

There should be no "snapshot" section in the CHANGELOG.md in a release branch. A "snapshot" section is a placeholder for a WIP release, it can only exists in the master branch, and should be renamed when we cut a release.

The correct order should have been:

  • master branch has 17.0.0-snapshot
  • release-17.0 branch renames 17.0.0-snapshot into v17.14.0a1
  • Cherry-pick: Update CHANGELOG with v17.14.0a1 #1322 cherrypicks the rename back to master branch
  • master branch has 18.0.0-snapshot (this didn't happen, we did everything in release-18.0 and left the master branch behind)
  • release-18.0 branch renames 18.0.0-snapshot into v18.17.0a1 (we are here)
  • cherrypick the rename back to master branch (this is not possible yet. Master branch is still at 17.0.0-snapshot. I need to make the master branch catch up)

Copy link
Contributor

Choose a reason for hiding this comment

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

ok. so the problem is there is only one 'master' branch, which would force the sequential ordering of the releases, that makes parallel releases painful. i think we either fix the above process to make parallel releases easy, or we do just one release a time (once we catch up with the k/k releases).

Copy link
Member Author

Choose a reason for hiding this comment

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

the sole purpose of this PR is to have the correct release note for v18.17.0a1 in https://github.com/kubernetes-client/python/blob/release-18.0/CHANGELOG.md, which is the linked place we documented in https://github.com/kubernetes-client/python/releases/tag/v18.17.0a1

Copy link
Member Author

@roycaihw roycaihw Apr 22, 2021

Choose a reason for hiding this comment

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

i think we either fix the above process to make parallel releases easy, or we do just one release a time (once we catch up with the k/k releases)

My plan is to do the latter using scripts which automate the release, once we clear up the parallel 17 and 18 releases. Everything starting v18.x.0b1 can be sequential

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 22, 2021
@yliaog
Copy link
Contributor

yliaog commented Apr 22, 2021

please update the description about renaming 1.17-snapshot

@roycaihw
Copy link
Member Author

please update the description about renaming 1.17-snapshot

Done

@roycaihw roycaihw changed the title Fix release notes for v18.17.0a1 in release-18.0 branch Fix release notes for v18.17.0a1 and v17.14.0a1 in release-18.0 branch Apr 22, 2021
@yliaog
Copy link
Contributor

yliaog commented Apr 22, 2021

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 22, 2021
@k8s-ci-robot k8s-ci-robot merged commit fa64fd9 into kubernetes-client:release-18.0 Apr 22, 2021
@roycaihw roycaihw deleted the fix-release-notes branch April 23, 2021 00:53
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/documentation Categorizes issue or PR as related to documentation. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants