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

📖 Fix formatting for book plantuml image #7042

Merged

Conversation

killianmuldoon
Copy link
Contributor

Signed-off-by: killianmuldoon kmuldoon@vmware.com

Fix a formatting issue resulting from a recent update of the plantuml version used to generate images.

Related to #7017, #7033

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Aug 9, 2022
@k8s-ci-robot
Copy link
Contributor

@killianmuldoon: 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 needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. label Aug 9, 2022
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 9, 2022
Copy link
Contributor Author

@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.

@oscr Do you think this is close enough to the original version? It's an easy enough fix for the other PR if so.

Signed-off-by: killianmuldoon <kmuldoon@vmware.com>
@oscr
Copy link
Contributor

oscr commented Aug 9, 2022

@oscr Do you think this is close enough to the original version? It's an easy enough fix for the other PR if so.

I think this looks great. Great catch and fix. Looks closer to the old image:
https://github.com/kubernetes-sigs/cluster-api/pull/7017/files#diff-c5d7dddf5137951a5a2973770b166e01bc529d2cb498598752893a8addb901ca

@killianmuldoon killianmuldoon changed the title [WIP] 📖 Fix formatting for book plantuml image 📖 Fix formatting for book plantuml image Aug 9, 2022
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 9, 2022
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.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 10, 2022
Copy link
Member

@chrischdi chrischdi left a comment

Choose a reason for hiding this comment

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

/lgtm

Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

/approve

@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 Aug 10, 2022
@k8s-ci-robot k8s-ci-robot merged commit 129c325 into kubernetes-sigs:main Aug 10, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.3 milestone Aug 10, 2022
@killianmuldoon
Copy link
Contributor Author

/cherry-pick release-1.2

@k8s-infra-cherrypick-robot

@killianmuldoon: #7042 failed to apply on top of branch "release-1.2":

Applying: Fix formatting for book plantuml image
warning: Cannot merge binary files: docs/book/src/images/runtime-sdk-topology-mutation.png (HEAD vs. Fix formatting for book plantuml image)
Using index info to reconstruct a base tree...
M	docs/book/src/images/runtime-sdk-topology-mutation.png
Falling back to patching base and 3-way merge...
Auto-merging docs/book/src/images/runtime-sdk-topology-mutation.png
CONFLICT (content): Merge conflict in docs/book/src/images/runtime-sdk-topology-mutation.png
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix formatting for book plantuml image
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.2

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.

@sbueringer
Copy link
Member

sbueringer commented Aug 15, 2022

@killianmuldoon do we need a manual cherry-pick for this?

@killianmuldoon
Copy link
Contributor Author

We could, but I don't believe it's necessary as the verison in the current book is fine, and I didn't want to add too many items to the merge queue for the 1.2 release.

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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants