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

[release-1.2] 📖 Update docs/Makefile. Fix proposal diagrams transparency #7050

Merged

Conversation

oscr
Copy link
Contributor

@oscr oscr commented Aug 10, 2022

What this PR does / why we need it:

Adds 3 pr's that updates the CAPI book and proposals diagrams and the Makefile.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Aug 10, 2022
@k8s-ci-robot
Copy link
Contributor

@oscr: This issue is currently awaiting triage.

If CAPI contributors determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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 the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 10, 2022
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.

I'm not sure if we can combine cherry-picks for PRs @vincepri @ykakarap WDYT?

For this and other doc PRs it's not important - we're not cherry picking to get into a release we're just trying to get the latest docs into the version of the book that's available at the principle branch.

Copy link
Contributor

@ykakarap ykakarap left a comment

Choose a reason for hiding this comment

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

I would be fine with adding the 2 cherry-picks to this PR given that they are related.

Let's make sure to update the PR description to clearly call out that it is a manual cherry pick for the 2 PRs and also let's update the title of the PR to reflect the changes (important when generating the release catalog).

@oscr oscr force-pushed the release-1.2-update-docs-makefile branch from 22a3313 to 7854dd9 Compare August 11, 2022 09:49
@oscr
Copy link
Contributor Author

oscr commented Aug 11, 2022

I also included #7017 to keep the build working. With it make diagrams doesn't produce a diff.

@oscr
Copy link
Contributor Author

oscr commented Aug 11, 2022

@ykakarap I updated the pr description to reflect the changes as you mentioned. Anything you would like to add?

@killianmuldoon
Copy link
Contributor

One thing 🙂
/retitle [release-1.2] Update docs/Makefile. Fix proposal diagrams transparency

@k8s-ci-robot k8s-ci-robot changed the title 📖 Update docs/Makefile. Fix proposal diagrams transparency issue with new [release-1.2] Update docs/Makefile. Fix proposal diagrams transparency Aug 11, 2022
@killianmuldoon
Copy link
Contributor

That just brings the title into line with how we tend to do other cherry-picks

@killianmuldoon
Copy link
Contributor

One thing 🙂
/retitle [release-1.2] 📖 Update docs/Makefile. Fix proposal diagrams transparency

@k8s-ci-robot k8s-ci-robot changed the title [release-1.2] Update docs/Makefile. Fix proposal diagrams transparency [release-1.2] 📖 Update docs/Makefile. Fix proposal diagrams transparency Aug 11, 2022
@sbueringer
Copy link
Member

sbueringer commented Aug 16, 2022

Is there a reason why we can't cherry-pick the individual PRs in the right order? It would save us the work of re-reviewing all changes and would keep it a lot simpler tracking-wise

@oscr
Copy link
Contributor Author

oscr commented Aug 17, 2022

The reason was a merge conflict when cherry-picking #7046. I also added #7017 to ensure that if you run make diagrams and get the new diagrams.

@sbueringer
Copy link
Member

Sounds good.

We should cherry-pick #7056 after #7050 is merged

@sbueringer
Copy link
Member

Diffed against main. Everything identical apart from #7056

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 17, 2022
@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 Aug 17, 2022
@k8s-ci-robot k8s-ci-robot merged commit 0375673 into kubernetes-sigs:release-1.2 Aug 17, 2022
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. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. 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