Skip to content

Use Control Plane instead of Master#18438

Merged
k8s-ci-robot merged 6 commits intokubernetes:masterfrom
Fale:master-to-control-plane
Jan 16, 2020
Merged

Use Control Plane instead of Master#18438
k8s-ci-robot merged 6 commits intokubernetes:masterfrom
Fale:master-to-control-plane

Conversation

@Fale
Copy link
Copy Markdown
Member

@Fale Fale commented Jan 3, 2020

Control Plane is more specific than Master

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/en Issues or PRs related to English language size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Jan 3, 2020
@Fale
Copy link
Copy Markdown
Member Author

Fale commented Jan 3, 2020

/assign @sftim

Copy link
Copy Markdown
Contributor

@sftim sftim left a comment

Choose a reason for hiding this comment

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

Nice, I'm glad you're tackling this.

I do have a concern that I think should block approval:
This change also needs to update the diagram to say “Control plane” rather than “Master”. I think that if the diagram does not match the text a reader new to Kubernetes might find it frustrating to have to work out the equivalence.

Also, much less important: I think the very first sentence in the page body could read better.

Fale added 2 commits January 12, 2020 18:59
…o re-create it from scratch. I kept the visual similarities as mush as possible
@Fale Fale force-pushed the master-to-control-plane branch from 51afc1d to b4b7821 Compare January 12, 2020 17:59
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 12, 2020
@Fale
Copy link
Copy Markdown
Member Author

Fale commented Jan 12, 2020

@sftim
I had to recreate the image from scratch, since the png was not matching the svg.
Now the svg is way easier to modify, since every opject is an object by itself and the text is editable.

As for the other comments, they should all be addressed, I belive

Copy link
Copy Markdown
Contributor

@sftim sftim left a comment

Choose a reason for hiding this comment

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

minor, but I think important, detail:
Check the glossary definitions for kube-scheduler and kube-controller-manager - these are rendered into that page.

@Fale
Copy link
Copy Markdown
Member Author

Fale commented Jan 13, 2020

@sftim the glossaries should be fixed as well now!

@sftim
Copy link
Copy Markdown
Contributor

sftim commented Jan 14, 2020

I should have mentioned the glossary definition for cluster too; there's a similar issue there.
Sorry to have missed this before @Fale
The wording I'd pick (to be rendered into the page you're changing is:

A Kubernetes cluster consists of a control plane together with a set of worker
machines, called nodes, that run containerized applications. Every cluster needs at
least one node.

The worker node(s) host the pods that are the components of the application.
The control plane manages the worker nodes and the pods in that cluster. In production
environments, it's typical to run a control plane across multiple computers and also to
run multiple nodes, to provide fault-tolerance and high availability.

What do you think?

@sftim
Copy link
Copy Markdown
Contributor

sftim commented Jan 15, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 15, 2020
@sftim
Copy link
Copy Markdown
Contributor

sftim commented Jan 15, 2020

I'd like more eyes on this because it's a change in wording that will drive further revisions to the site. Happy to approve on lazy consensus.

Copy link
Copy Markdown

@celestehorgan celestehorgan left a comment

Choose a reason for hiding this comment

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

Hello!

These are mostly grammar changes – on the whole this is a great PR! 👍

@Fale
Copy link
Copy Markdown
Member Author

Fale commented Jan 16, 2020

thanks a lot @celestehorgan for the suggested changes :-)

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 16, 2020
@sftim
Copy link
Copy Markdown
Contributor

sftim commented Jan 16, 2020

/approve
@celestehorgan please take another look and add /lgtm if you're happy

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sftim

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 Jan 16, 2020
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

@celestehorgan: changing LGTM is restricted to collaborators

Details

In response to this:

/lgtm

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.

@celestehorgan
Copy link
Copy Markdown

@sftim I don't have an official collaborator role on this project yet, so it's not needed – but it does lgtm :)

@sftim
Copy link
Copy Markdown
Contributor

sftim commented Jan 16, 2020

@celestehorgan that's fine; I'm happy to confirm:
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 16, 2020
@k8s-ci-robot k8s-ci-robot merged commit 99ca9c0 into kubernetes:master Jan 16, 2020
@Fale Fale deleted the master-to-control-plane branch January 16, 2020 17:02
wawa0210 pushed a commit to wawa0210/website that referenced this pull request Mar 2, 2020
* Use Control Plane instead of Master

* improve image. The SVG was not matching the PNG, so I basically had to re-create it from scratch. I kept the visual similarities as mush as possible

* remove tautological phrase

* fix glossary references as well

* improve cluster glossary to move from Master to Control Plane

* improve english form
nownabe added a commit to nownabe/website that referenced this pull request Jul 18, 2020
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. language/en Issues or PRs related to English language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants