Skip to content

Commit 232d184

Browse files
committed
Merge branch 'master' of https://github.com/kubernetes/website into chenopis-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
2 parents f3f057a + dd7bb34 commit 232d184

140 files changed

Lines changed: 2594 additions & 2183 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

OWNERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
reviewers:
2+
- tengqm
3+
- zhangxiaoyu-zidif
4+
- xiangpengzhao
5+
approvers:
6+
- heckj
27
- a-mccarthy
38
- abiogenesis-now
49
- bradamant3

_data/concepts.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,20 @@ toc:
99
section:
1010
- docs/concepts/overview/what-is-kubernetes.md
1111
- docs/concepts/overview/components.md
12+
- docs/concepts/overview/kubernetes-api.md
1213
- title: Working with Kubernetes Objects
1314
section:
1415
- docs/concepts/overview/working-with-objects/kubernetes-objects.md
1516
- docs/concepts/overview/working-with-objects/names.md
1617
- docs/concepts/overview/working-with-objects/namespaces.md
1718
- docs/concepts/overview/working-with-objects/labels.md
1819
- docs/concepts/overview/working-with-objects/annotations.md
19-
- docs/concepts/overview/kubernetes-api.md
20+
- title: Object Management Using kubectl
21+
section:
22+
- docs/concepts/overview/object-management-kubectl/overview.md
23+
- docs/concepts/overview/object-management-kubectl/imperative-command.md
24+
- docs/concepts/overview/object-management-kubectl/imperative-config.md
25+
- docs/concepts/overview/object-management-kubectl/declarative-config.md
2026

2127
- title: Kubernetes Architecture
2228
landing_page: /docs/concepts/architecture/nodes/

_data/glossary/_example.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
id: _example
22
name: Example K8s Term
3-
full-link: kubernetes.io/docs/link-to-long-dedicated-docs-page
3+
full-link: /docs/link-to-long-dedicated-docs-page
44
aka:
55
- Slang K8s Term
66
- Misnomer

_data/glossary/controller.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
id: controller
2+
name: Controller
3+
full-link: /docs/admin/kube-controller-manager/
4+
related:
5+
- controller-manager
6+
tags:
7+
- architecture
8+
- fundamental
9+
short-description: >
10+
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.
11+
long-description: >
12+
Examples of controllers that ship with Kubernetes today are the replication controller, endpoints controller, namespace controller, and serviceaccounts controller.

_data/glossary/etcd.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
id: etcd
2+
name: etcd
3+
full-link: /docs/tasks/administer-cluster/configure-upgrade-etcd/
4+
tags:
5+
- architecture
6+
- storage
7+
short-description: >
8+
Consistent and highly-available key value store used as Kubernetes' backing store for all cluster data.
9+
long-description: >
10+
Always have a backup plan for etcd's data for your Kubernetes cluster.
11+
For in-depth information on etcd, see [etcd documentation](https://github.com/coreos/etcd/blob/master/Documentation/docs.md).

_data/glossary/kube-apiserver.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
id: kube-apiserver
2+
name: kube-apiserver
3+
full-link: /docs/reference/generated/kube-apiserver/
4+
aka:
5+
- apiserver
6+
tags:
7+
- architecture
8+
- fundamental
9+
short-description: >
10+
Component on the master that exposes the Kubernetes API. It is the front-end for the Kubernetes control plane.
11+
long-description: >
12+
It is designed to scale horizontally -- that is, it scales by deploying more instances. See [Building High-Availability Clusters](/docs/admin/high-availability/).
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
id: kube-controller-manager
2+
name: kube-controller-manager
3+
full-link: /docs/reference/generated/kube-controller-manager/
4+
aka:
5+
- controller-manager
6+
related:
7+
- controller
8+
tags:
9+
- architecture
10+
- fundamental
11+
short-description: >
12+
Component on the master that runs {% glossary_tooltip text="controllers" term_id="controller" %}.
13+
long-description: >
14+
Logically, each {% glossary_tooltip text="controller" term_id="controller" %} is a separate process, but to reduce complexity, they are all compiled into a single binary and run in a single process.

_data/glossary/kube-scheduler.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
id: kube-scheduler
2+
name: kube-scheduler
3+
full-link: /docs/reference/generated/kube-scheduler/
4+
aka:
5+
- scheduler
6+
tags:
7+
- architecture
8+
short-description: >
9+
Component on the master that watches newly created pods that have no node assigned, and selects a node for them to run on.
10+
long-description: >
11+
Factors taken into account for scheduling decisions include individual and collective resource requirements,
12+
hardware/software/policy constraints, affinity and anti-affinity specifications, data locality, inter-workload interference
13+
and deadlines.

_data/glossary/name.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
id: name
2+
name: Name
3+
full-link: /docs/concepts/overview/working-with-objects/names
4+
tags:
5+
- fundamental
6+
short-description: >
7+
A client-provided string that refers to an object in a resource URL, such as `/api/v1/pods/some-name`.
8+
long-description: >
9+
Only one object of a given kind can have a given name at a time.
10+
However, if you delete the object, you can make a new object with the same name.

_data/glossary/statefulset.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
id: statefulset
22
name: StatefulSet
33
full-link: /docs/concepts/workloads/controllers/statefulset/
4-
aka:
5-
- PetSet
64
related:
75
- deployment
86
- pod

0 commit comments

Comments
 (0)