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

📖 Add PlantUML diagram transparency for book and proposals #7046

Merged
merged 1 commit into from
Aug 10, 2022

Conversation

oscr
Copy link
Contributor

@oscr oscr commented Aug 10, 2022

What this PR does / why we need it:

After upgrading PlantUML @killianmuldoon noticed some differences between how the diagrams where rendered before and after the upgrade. While working on how to recreate the old look we noticed that you could add partial transparency to the diagrams which IMO looks better than solid white or fully transparent. Therefore I would like to suggested adding it. We can of course add more or less transparency if wanted.

@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/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 10, 2022
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.

Looks great!

/approve

@vincepri
Copy link
Member

/lgtm

@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 added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 10, 2022
@k8s-ci-robot k8s-ci-robot merged commit c1826ca 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

/cherry-pick release-1.2

@k8s-infra-cherrypick-robot

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

Applying: Add PlantUML diagram transparency for book and proposals
Using index info to reconstruct a base tree...
M	docs/book/src/images/runtime-sdk-topology-mutation.plantuml
M	docs/book/src/images/runtime-sdk-topology-mutation.png
M	docs/proposals/images/cluster-class/create.plantuml
M	docs/proposals/images/cluster-class/create.png
M	docs/proposals/images/cluster-class/update.plantuml
M	docs/proposals/images/cluster-class/update.png
M	docs/proposals/images/cluster-spec-crds/figure1.plantuml
M	docs/proposals/images/cluster-spec-crds/figure1.png
M	docs/proposals/images/controlplane/controlplane-init-1.plantuml
M	docs/proposals/images/controlplane/controlplane-init-1.png
M	docs/proposals/images/controlplane/controlplane-init-2.plantuml
M	docs/proposals/images/controlplane/controlplane-init-2.png
M	docs/proposals/images/controlplane/controlplane-init-3.plantuml
M	docs/proposals/images/controlplane/controlplane-init-3.png
M	docs/proposals/images/controlplane/controlplane-init-4.plantuml
M	docs/proposals/images/controlplane/controlplane-init-4.png
M	docs/proposals/images/controlplane/controlplane-init-6.plantumlwarning: Cannot merge binary files: docs/proposals/images/topology-mutation-hook/topology-reconciliation.png (HEAD vs. Add PlantUML diagram transparency for book and proposals)
warning: Cannot merge binary files: docs/proposals/images/machinepool-api/figure1.png (HEAD vs. Add PlantUML diagram transparency for book and proposals)
warning: Cannot merge binary files: docs/proposals/images/machine-states-preboot/Figure8.png (HEAD vs. Add PlantUML diagram transparency for book and proposals)
warning: Cannot merge binary files: docs/proposals/images/machine-states-preboot/Figure3.png (HEAD vs. Add PlantUML diagram transparency for book and proposals)
warning: Cannot merge binary files: docs/proposals/images/controlplane/controlplane-init-7.png (HEAD vs. Add PlantUML diagram transparency for book and proposals)
warning: Cannot merge binary files: docs/proposals/images/controlplane/controlplane-init-6.png (HEAD vs. Add PlantUML diagram transparency for book and proposals)
warning: Cannot merge binary files: docs/proposals/images/controlplane/controlplane-init-4.png (HEAD vs. Add PlantUML diagram transparency for book and proposals)
warning: Cannot merge binary files: docs/proposals/images/controlplane/controlplane-init-3.png (HEAD vs. Add PlantUML diagram transparency for book and proposals)
warning: Cannot merge binary files: docs/proposals/images/controlplane/controlplane-init-2.png (HEAD vs. Add PlantUML diagram transparency for book and proposals)
warning: Cannot merge binary files: docs/proposals/images/controlplane/controlplane-init-1.png (HEAD vs. Add PlantUML diagram transparency for book and proposals)
warning: Cannot merge binary files: docs/proposals/images/cluster-spec-crds/figure1.png (HEAD vs. Add PlantUML diagram transparency for book and proposals)
warning: Cannot merge binary files: docs/proposals/images/cluster-class/update.png (HEAD vs. Add PlantUML diagram transparency for book and proposals)
warning: Cannot merge binary files: docs/proposals/images/cluster-class/create.png (HEAD vs. Add PlantUML diagram transparency for book and proposals)
warning: Cannot merge binary files: docs/book/src/images/runtime-sdk-topology-mutation.png (HEAD vs. Add PlantUML diagram transparency for book and proposals)

M	docs/proposals/images/controlplane/controlplane-init-6.png
M	docs/proposals/images/controlplane/controlplane-init-7.plantuml
M	docs/proposals/images/controlplane/controlplane-init-7.png
M	docs/proposals/images/machine-states-preboot/Figure3.plantuml
M	docs/proposals/images/machine-states-preboot/Figure3.png
M	docs/proposals/images/machine-states-preboot/Figure8.plantuml
M	docs/proposals/images/machine-states-preboot/Figure8.png
M	docs/proposals/images/machinepool-api/figure1.plantuml
M	docs/proposals/images/machinepool-api/figure1.png
M	docs/proposals/images/topology-mutation-hook/topology-reconciliation.plantuml
M	docs/proposals/images/topology-mutation-hook/topology-reconciliation.png
Falling back to patching base and 3-way merge...
Auto-merging docs/proposals/images/topology-mutation-hook/topology-reconciliation.png
CONFLICT (content): Merge conflict in docs/proposals/images/topology-mutation-hook/topology-reconciliation.png
Auto-merging docs/proposals/images/topology-mutation-hook/topology-reconciliation.plantuml
CONFLICT (content): Merge conflict in docs/proposals/images/topology-mutation-hook/topology-reconciliation.plantuml
Auto-merging docs/proposals/images/machinepool-api/figure1.png
CONFLICT (content): Merge conflict in docs/proposals/images/machinepool-api/figure1.png
Auto-merging docs/proposals/images/machinepool-api/figure1.plantuml
CONFLICT (content): Merge conflict in docs/proposals/images/machinepool-api/figure1.plantuml
Auto-merging docs/proposals/images/machine-states-preboot/Figure8.png
CONFLICT (content): Merge conflict in docs/proposals/images/machine-states-preboot/Figure8.png
Auto-merging docs/proposals/images/machine-states-preboot/Figure8.plantuml
CONFLICT (content): Merge conflict in docs/proposals/images/machine-states-preboot/Figure8.plantuml
Auto-merging docs/proposals/images/machine-states-preboot/Figure3.png
CONFLICT (content): Merge conflict in docs/proposals/images/machine-states-preboot/Figure3.png
Auto-merging docs/proposals/images/machine-states-preboot/Figure3.plantuml
CONFLICT (content): Merge conflict in docs/proposals/images/machine-states-preboot/Figure3.plantuml
Auto-merging docs/proposals/images/controlplane/controlplane-init-7.png
CONFLICT (content): Merge conflict in docs/proposals/images/controlplane/controlplane-init-7.png
Auto-merging docs/proposals/images/controlplane/controlplane-init-7.plantuml
CONFLICT (content): Merge conflict in docs/proposals/images/controlplane/controlplane-init-7.plantuml
Auto-merging docs/proposals/images/controlplane/controlplane-init-6.png
CONFLICT (content): Merge conflict in docs/proposals/images/controlplane/controlplane-init-6.png
Auto-merging docs/proposals/images/controlplane/controlplane-init-6.plantuml
CONFLICT (content): Merge conflict in docs/proposals/images/controlplane/controlplane-init-6.plantuml
Auto-merging docs/proposals/images/controlplane/controlplane-init-4.png
CONFLICT (content): Merge conflict in docs/proposals/images/controlplane/controlplane-init-4.png
Auto-merging docs/proposals/images/controlplane/controlplane-init-4.plantuml
CONFLICT (content): Merge conflict in docs/proposals/images/controlplane/controlplane-init-4.plantuml
Auto-merging docs/proposals/images/controlplane/controlplane-init-3.png
CONFLICT (content): Merge conflict in docs/proposals/images/controlplane/controlplane-init-3.png
Auto-merging docs/proposals/images/controlplane/controlplane-init-3.plantuml
CONFLICT (content): Merge conflict in docs/proposals/images/controlplane/controlplane-init-3.plantuml
Auto-merging docs/proposals/images/controlplane/controlplane-init-2.png
CONFLICT (content): Merge conflict in docs/proposals/images/controlplane/controlplane-init-2.png
Auto-merging docs/proposals/images/controlplane/controlplane-init-2.plantuml
CONFLICT (content): Merge conflict in docs/proposals/images/controlplane/controlplane-init-2.plantuml
Auto-merging docs/proposals/images/controlplane/controlplane-init-1.png
CONFLICT (content): Merge conflict in docs/proposals/images/controlplane/controlplane-init-1.png
Auto-merging docs/proposals/images/controlplane/controlplane-init-1.plantuml
CONFLICT (content): Merge conflict in docs/proposals/images/controlplane/controlplane-init-1.plantuml
Auto-merging docs/proposals/images/cluster-spec-crds/figure1.png
CONFLICT (content): Merge conflict in docs/proposals/images/cluster-spec-crds/figure1.png
Auto-merging docs/proposals/images/cluster-spec-crds/figure1.plantuml
CONFLICT (content): Merge conflict in docs/proposals/images/cluster-spec-crds/figure1.plantuml
Auto-merging docs/proposals/images/cluster-class/update.png
CONFLICT (content): Merge conflict in docs/proposals/images/cluster-class/update.png
Auto-merging docs/proposals/images/cluster-class/update.plantuml
CONFLICT (content): Merge conflict in docs/proposals/images/cluster-class/update.plantuml
Auto-merging docs/proposals/images/cluster-class/create.png
CONFLICT (content): Merge conflict in docs/proposals/images/cluster-class/create.png
Auto-merging docs/proposals/images/cluster-class/create.plantuml
CONFLICT (content): Merge conflict in docs/proposals/images/cluster-class/create.plantuml
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
Auto-merging docs/book/src/images/runtime-sdk-topology-mutation.plantuml
CONFLICT (content): Merge conflict in docs/book/src/images/runtime-sdk-topology-mutation.plantuml
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 PlantUML diagram transparency for book and proposals
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.

@oscr oscr deleted the plantuml-add-transparency branch August 10, 2022 17:09
@killianmuldoon
Copy link
Contributor

killianmuldoon commented Aug 10, 2022

Can't backport because we're changing - @oscr do you want to open a PR against release 1.2? We'll also need to do the same for #7033

@oscr
Copy link
Contributor Author

oscr commented Aug 10, 2022

No problem! I'll open a pr for each in the correct order.

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

Successfully merging this pull request may close these issues.

5 participants