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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-1.6] 馃摉 Cluster api manifesto #10404

Merged
merged 2 commits into from
Apr 9, 2024
Merged

[release-1.6] 馃摉 Cluster api manifesto #10404

merged 2 commits into from
Apr 9, 2024

Conversation

k8s-infra-cherrypick-robot
Copy link

This is an automated cherry-pick of #10329

/assign killianmuldoon

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Apr 9, 2024
Merged
@k8s-ci-robot k8s-ci-robot added this to the v1.6 milestone Apr 9, 2024
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-area PR is missing an area label labels Apr 9, 2024
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Apr 9, 2024
@sbueringer
Copy link
Member

/hold

/lgtm
/approve

Let's make sure we merge this into release-1.7 as well

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 9, 2024
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 9, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 5f8507bd0e19064582c6cf6dbd01319a6a33b69b

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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 Apr 9, 2024
killianmuldoon
killianmuldoon reviewed Apr 9, 2024
View reviewed changes
Copy link
Contributor

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

/area documentation

@k8s-ci-robot k8s-ci-robot added area/documentation Issues or PRs related to documentation and removed do-not-merge/needs-area PR is missing an area label labels Apr 9, 2024
@killianmuldoon
Copy link
Contributor

This is already in release-1.7 as the branch was created after merging AFAIU

@killianmuldoon
Copy link
Contributor

You happy to remove the hold?

@sbueringer
Copy link
Member

sbueringer commented Apr 9, 2024 •
edited
Loading

Sorry yup. Got confused by the report that it doesn't show up on the website. But of course at this point release-1.7 is not on https://cluster-api.sigs.k8s.io/
(but instead https://release-1-7.cluster-api.sigs.k8s.io/user/manifesto)

@sbueringer
Copy link
Member

/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 Apr 9, 2024
@sbueringer
Copy link
Member

Also got confused by your comment 馃槀 "Needs to be done manually"

@k8s-ci-robot k8s-ci-robot merged commit 90d78fa into kubernetes-sigs:release-1.6 Apr 9, 2024
22 checks passed
@killianmuldoon
Copy link
Contributor

Also got confused by your comment 馃槀 "Needs to be done manually"

I was confused at the time - cherry-pick bot returned a conflict, but once I tried it manually I saw what was happening

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@killianmuldoon killianmuldoon killianmuldoon left review comments

@richardcase richardcase Awaiting requested review from richardcase

@ykakarap ykakarap Awaiting requested review from ykakarap

Assignees

@sbueringer sbueringer

@killianmuldoon killianmuldoon

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/documentation Issues or PRs related to documentation 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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.6
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@k8s-infra-cherrypick-robot @sbueringer @k8s-ci-robot @killianmuldoon @fabriziopandini