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

🌱 Add image promotion make target using kpromo #5713

Merged
merged 1 commit into from
Nov 30, 2021
Merged

🌱 Add image promotion make target using kpromo #5713

merged 1 commit into from
Nov 30, 2021

Conversation

CecileRobertMichon
Copy link
Contributor

What this PR does / why we need it: THIS WILL OPEN A PR FOR YOU IN k8s.io!! no more searching through the UI, copy pasting SHAs, all it takes is running "make promote-images" and voila! It will even assign the right people automatically 🪄

This is based on some great work by @puerco + @palnabarun in krel and @justaugustus in kubernetes-sigs/promo-tools#458 ❤️

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 19, 2021
@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Nov 19, 2021
@CecileRobertMichon
Copy link
Contributor Author

/assign @vincepri

sbueringer
sbueringer reviewed Nov 22, 2021
View reviewed changes
Copy link
Member

@sbueringer sbueringer left a comment

Choose a reason for hiding this comment

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

Nice!
one nit

hack/get-project-maintainers.sh Outdated Show resolved Hide resolved
fabriziopandini
fabriziopandini reviewed Nov 22, 2021
View reviewed changes
Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

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

This is great, thanks @CecileRobertMichon !

Makefile Show resolved Hide resolved
@fabriziopandini
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 22, 2021
palnabarun
palnabarun reviewed Nov 23, 2021
View reviewed changes
Makefile Show resolved Hide resolved
@palnabarun
Copy link
Member

Thanks for integrating the promotion tooling in Cluster API! ❤️

@CecileRobertMichon
Copy link
Contributor Author

testing:

/assign @kubernetes-sigs/cluster-api-maintainers

@fabriziopandini
Copy link
Member

/lgtm
@CecileRobertMichon given that we are not planning a release soon, would it be fine to wait for next week so also people out for thanksgiving could take a proper look.
Otherwise, I'm happy to approve this as well

@sbueringer
Copy link
Member

/lgtm

@CecileRobertMichon
Copy link
Contributor Author

@fabriziopandini absolutely, thank you for the review!

@CecileRobertMichon
Copy link
Contributor Author

@vincepri PTAL when you get a chance :)

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 29, 2021
@vincepri
Copy link
Member

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 29, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vincepri

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 29, 2021
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 29, 2021
@vincepri
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 30, 2021
@vincepri
Copy link
Member

@CecileRobertMichon ok to backport?

@k8s-ci-robot k8s-ci-robot merged commit 89a4583 into kubernetes-sigs:main Nov 30, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.1 milestone Nov 30, 2021
@CecileRobertMichon
Copy link
Contributor Author

ok to backport?

we shouldn't need to backport, you can just use the main branch to run make promote-images. As long as you have the RELEASE_TAG set to the tag getting released.

@CecileRobertMichon
Copy link
Contributor Author

/cherry-pick release-0.4
/cherry-pick release-1.0

@k8s-infra-cherrypick-robot
Copy link

@CecileRobertMichon: #5713 failed to apply on top of branch "release-0.4":

Applying: Add image promotion make target using kpromo
Using index info to reconstruct a base tree...
M	Makefile
M	hack/tools/go.mod
M	hack/tools/go.sum
M	hack/tools/tools.go
Falling back to patching base and 3-way merge...
Auto-merging hack/tools/tools.go
Auto-merging hack/tools/go.sum
CONFLICT (content): Merge conflict in hack/tools/go.sum
Auto-merging hack/tools/go.mod
CONFLICT (content): Merge conflict in hack/tools/go.mod
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add image promotion make target using kpromo
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-0.4
/cherry-pick release-1.0

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.

@CecileRobertMichon
Copy link
Contributor Author

/cherry-pick release-1.0

@k8s-infra-cherrypick-robot
Copy link

@CecileRobertMichon: #5713 failed to apply on top of branch "release-1.0":

Applying: Add image promotion make target using kpromo
Using index info to reconstruct a base tree...
M	Makefile
M	hack/tools/go.mod
M	hack/tools/go.sum
M	hack/tools/tools.go
Falling back to patching base and 3-way merge...
Auto-merging hack/tools/tools.go
Auto-merging hack/tools/go.sum
CONFLICT (content): Merge conflict in hack/tools/go.sum
Auto-merging hack/tools/go.mod
CONFLICT (content): Merge conflict in hack/tools/go.mod
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add image promotion make target using kpromo
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.0

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.

This was referenced Dec 9, 2021
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@palnabarun palnabarun palnabarun left review comments

@fabriziopandini fabriziopandini fabriziopandini left review comments

@sbueringer sbueringer sbueringer left review comments

@vincepri vincepri vincepri left review comments

@stmcginnis stmcginnis Awaiting requested review from stmcginnis

Assignees

@vincepri vincepri

@sbueringer sbueringer

@fabriziopandini fabriziopandini

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. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
v1.1
Development

Successfully merging this pull request may close these issues.
7 participants
@CecileRobertMichon @fabriziopandini @palnabarun @sbueringer @vincepri @k8s-ci-robot @k8s-infra-cherrypick-robot