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.

Sign up for GitHub

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

Jump to bottom

Fix version.go after relase 1.5.5 #43568

Merged
merged 1 commit into from
Mar 24, 2017
Merged

Fix version.go after relase 1.5.5 #43568

merged 1 commit into from
Mar 24, 2017

Conversation

mwielgus
Copy link
Contributor

The security release 1.5.5 was done in a separate branch. PodSecurityPolicy fix has been added to 1.5 release branch. However the update of version.go didn't go through. This PR fixes it.

The commit history on release-1.5 will NOT be altered to reflect where (and with what commits) 1.5.5 was made. Changing history in published repos is strongly discouraged by all git docs/tutorials.

cc: @saad-ali @liggitt

@mwielgus mwielgus added area/build-release area/release-eng Issues or PRs related to the Release Engineering subproject release-note-none Denotes a PR that doesn't merit a release note. labels Mar 23, 2017
@mwielgus mwielgus added this to the v1.5 milestone Mar 23, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 23, 2017
@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 23, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@liggitt
Copy link
Member

liggitt commented Mar 23, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 23, 2017
@liggitt
Copy link
Member

liggitt commented Mar 23, 2017 •
edited

actually, why pick the 1.5.5 commit in? 1.5.5 was never in this branch, I'd expect the bump to 1.6.5-beta.0 only (the squashed version looks like what I'd expect)

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 23, 2017
@liggitt
Copy link
Member

liggitt commented Mar 23, 2017

/lgtm

assume you'll tag the resulting merge commit as v1.5.6-beta.0

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 23, 2017
@ixdy
Copy link
Member

ixdy commented Mar 23, 2017

Trying to understand what should have happened here - should we have updated pkg/version/base.go to v1.5.6-beta.0 in release-1.5.4, and then merged release-1.5.4 into release-1.5, instead of cherrypicking the fix into release-1.5 (resolving the pkg/version/base.go conflict to the release-1.5.4 version)?

@liggitt
Copy link
Member

liggitt commented Mar 23, 2017 •
edited

this PR is exactly what needs to happen. 1.5.5 was tagged from the release-1.5.4 branched off the v1.5.4 tag.

that means that release-1.5 is now headed for v1.5.6 and should be characterized as v1.5.6-beta.0 (so it needs the base.go update and a v1.5.6-beta.0 tag)

@liggitt
Copy link
Member

liggitt commented Mar 23, 2017

should we have updated pkg/version/base.go to v1.5.6-beta.0 in release-1.5.4

no, no further development will be done in that branch

@ixdy
Copy link
Member

ixdy commented Mar 23, 2017

I'm just trying to identify the workflow that reduces the amount of human work needed. Having to manually create several PRs to get everything into a correct state again seems non-ideal.

@liggitt
Copy link
Member

liggitt commented Mar 23, 2017 •
edited

the fix logically exists in three places (release-1.5.4 branch, release-1.5 branch, and master), so picking it doesn't bother me.

the base.go bump and tagging typically done by anago made several parts of the release process tricky (not just this part). Will include that in the retrospective for the 1.5.5 fix for discussion/improvement.

@thockin
Copy link
Member

thockin commented Mar 23, 2017

/approve

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt, mwielgus, thockin

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 23, 2017
@liggitt liggitt added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Mar 23, 2017
@mwielgus
Copy link
Contributor Author

@k8s-bot node e2e test this

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 1a17f8f into kubernetes:release-1.5 Mar 24, 2017
This was referenced Sep 11, 2020
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@liggitt liggitt

@saad-ali saad-ali

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/build-release area/release-eng Issues or PRs related to the Release Engineering subproject cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.5
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@mwielgus @k8s-reviewable @liggitt @ixdy @thockin @k8s-github-robot @saad-ali @k8s-ci-robot