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 kube-apiserver, kube-controller-manager, kube-scheduler and etcd to glossary. #6600

Merged
merged 5 commits into from
Jan 25, 2018

Conversation

ttz21
Copy link
Contributor

@ttz21 ttz21 commented Dec 5, 2017

Kubecon 2017

Add glossary terms for kube-apiserver, kube-controller-manager, kube-scheduler and etcd using existing text in docs/concepts/overview/components/ page.


This change is Reviewable

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 5, 2017
@k8sio-netlify-preview-bot
Copy link
Collaborator

k8sio-netlify-preview-bot commented Dec 5, 2017

Deploy preview for kubernetes-io-master-staging ready!

Built with commit 25eccb1

https://deploy-preview-6600--kubernetes-io-master-staging.netlify.com

@@ -0,0 +1,12 @@
id: controller
name: controller
Copy link
Contributor

Choose a reason for hiding this comment

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

s/controller/Controller.

- architecture
- fundamental
short-description: >
A control loop that watches the shared state of the cluster through the {% glossary_tooltip text="apiserver" term_id="kube-apiserver" %} and makes changes attempting to move the current state towards the desired state. Examples of controllers that ship with Kubernetes today are the replication controller, endpoints controller, namespace controller, and serviceaccounts controller
Copy link
Contributor

Choose a reason for hiding this comment

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

Please consolidate the examples in the long description.

Copy link
Contributor

Choose a reason for hiding this comment

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

Without it, the page will not render properly.

tags:
- architecture
short-description: >
Component on the master that watches newly created pods that have no node assigned, and selects a node for them to run on.
Copy link
Contributor

Choose a reason for hiding this comment

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

A long-description is required.

@zacharysarah
Copy link
Contributor

@ttz21 👋 Please resolve the merge conflicts so we can proceed.

ttz21 and others added 3 commits January 19, 2018 13:28
Making a trivial change to un-stuck Travis
Removing trivial change
@zacharysarah
Copy link
Contributor

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ttz21, zacharysarah

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

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your 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 25, 2018
@zacharysarah
Copy link
Contributor

Manually merging due to PR age.

@zacharysarah zacharysarah merged commit 3c50ce9 into kubernetes:master Jan 25, 2018
chenopis added a commit that referenced this pull request Jan 29, 2018
…henopis-user-journeys

* 'master' of https://github.com/kubernetes/website: (102 commits)
  Change deployment group (#7112)
  fix typos in extending doc (#7110)
  added installation via Powershell Gallery (#6086)
  Update StatefulSet API version to 1.9 for the Cassandra example (#7096)
  Modify the terms by document style (#7026)
  now that phase out in k8s/cluster/ directory, so remove relative docs (#6951)
  Update mysql-wordpress-persistent-volume.md (#7080)
  Update high-availability.md (#7086)
  Feature gates reference documentation (#6364)
  Add link to autoscaler FAQ (#7045)
  Replace regular characters with HTML entities. (#7038)
  Remove unnecessary manual node object creation (#6765)
  upper case restriction doesn't exist (#7003)
  Add an API concepts document and describe terminology and API chunking (#6540)
  Add kube-apiserver, kube-controller-manager, kube-scheduler and etcd to glossary. (#6600)
  Update what-is-kubernetes.md (#6971)
  Fixed the interacting with cluster section for the ubuntu installation (#6905)
  Update weave-network-policy.md (#6960)
  Added AWS eks (#6568)
  Update eviction strategy to include priority (#6949)
  ...

# Conflicts:
#	_data/setup.yml
#	_data/tutorials.yml
#	docs/imported/release/notes.md
bitfield pushed a commit to bitfield/website that referenced this pull request Feb 19, 2018
…to glossary. (kubernetes#6600)

* Move master component definitions to glossary

* review comments

* Update controller.yaml

Making a trivial change to un-stuck Travis

* Update controller.yaml

Removing trivial change
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. 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