Skip to content

Commit 4142669

Browse files
authored
Merge pull request #1 from kubernetes/master
update from upstream
2 parents eba0555 + 606d0da commit 4142669

File tree

45 files changed

+2052
-1289
lines changed

Some content is hidden

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

45 files changed

+2052
-1289
lines changed

.github/OWNERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# See the OWNERS docs at https://go.k8s.io/owners
2+
3+
reviewers:
4+
- sig-docs-en-reviews # Defined in OWNERS_ALIASES
5+
6+
approvers:
7+
- sig-docs-en-owners # Defined in OWNERS_ALIASES

.github/workflows/OWNERS

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# See the OWNERS docs at https://go.k8s.io/owners
2+
3+
# When modifying this file, consider the security implications of
4+
# allowing listed reviewers / approvals to modify or remove any
5+
# configured GitHub Actions.
6+
7+
reviewers:
8+
- sig-docs-leads
9+
10+
approvers:
11+
- sig-docs-leads

config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ github_repo = "https://github.com/kubernetes/website"
157157
# param for displaying an announcement block on every page.
158158
# See /i18n/en.toml for message text and title.
159159
announcement = true
160-
announcement_bg = "#3f0374" # choose a dark color – text is white
160+
announcement_bg = "#3d4cb7" # choose a dark color – text is white
161161

162162
#Searching
163163
k8s_search = true

content/en/_index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
{{< blocks/section id="oceanNodes" >}}
1010
{{% blocks/feature image="flower" %}}
11-
[Kubernetes (K8s)]({{< relref "/docs/concepts/overview/what-is-kubernetes" >}}) is an open-source system for automating deployment, scaling, and management of containerized applications.
11+
[Kubernetes]({{< relref "/docs/concepts/overview/what-is-kubernetes" >}}), also known as K8s, is an open-source system for automating deployment, scaling, and management of containerized applications.
1212

1313
It groups containers that make up an application into logical units for easy management and discovery. Kubernetes builds upon [15 years of experience of running production workloads at Google](http://queue.acm.org/detail.cfm?id=2898444), combined with best-of-breed ideas and practices from the community.
1414
{{% /blocks/feature %}}
@@ -28,7 +28,7 @@
2828
{{% /blocks/feature %}}
2929

3030
{{% blocks/feature image="suitcase" %}}
31-
#### Run Anywhere
31+
#### Run K8s Anywhere
3232

3333
Kubernetes is open source giving you the freedom to take advantage of on-premises, hybrid, or public cloud infrastructure, letting you effortlessly move workloads to where it matters to you.
3434

content/en/docs/concepts/workloads/pods/pod-lifecycle.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ The `restartPolicy` applies to all containers in the Pod. `restartPolicy` only
142142
refers to restarts of the containers by the kubelet on the same node. After containers
143143
in a Pod exit, the kubelet restarts them with an exponential back-off delay (10s, 20s,
144144
40s, …), that is capped at five minutes. Once a container has executed for 10 minutes
145-
without any problems, the kubelet resets the restart backoff timer forthat container.
145+
without any problems, the kubelet resets the restart backoff timer for that container.
146146

147147
## Pod conditions
148148

content/en/docs/contribute/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
22
content_type: concept
3-
title: Contribute to Kubernetes docs
3+
title: Contribute to K8s docs
44
linktitle: Contribute
55
main_menu: true
66
no_list: true
77
weight: 80
88
card:
99
name: contribute
1010
weight: 10
11-
title: Start contributing
11+
title: Start contributing to K8s
1212
---
1313

1414
<!-- overview -->

content/en/docs/home/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ cards:
3232
button: "View Tutorials"
3333
button_path: "/docs/tutorials"
3434
- name: setup
35-
title: "Set up a cluster"
35+
title: "Set up a K8s cluster"
3636
description: "Get Kubernetes running based on your resources and needs."
3737
button: "Set up Kubernetes"
3838
button_path: "/docs/setup"
@@ -57,7 +57,7 @@ cards:
5757
button: Contribute to the docs
5858
button_path: /docs/contribute
5959
- name: release-notes
60-
title: Release Notes
60+
title: K8s Release Notes
6161
description: If you are installing Kubernetes or upgrading to the newest version, refer to the current release notes.
6262
button: "Download Kubernetes"
6363
button_path: "/docs/setup/release/notes"

content/en/docs/reference/command-line-tools-reference/feature-gates.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,11 @@ different Kubernetes components.
138138
| `RuntimeClass` | `true` | Beta | 1.14 | |
139139
| `SCTPSupport` | `false` | Alpha | 1.12 | 1.18 |
140140
| `SCTPSupport` | `true` | Beta | 1.19 | |
141-
| `ServiceAppProtocol` | `false` | Alpha | 1.18 | 1.18 |
142-
| `ServiceAppProtocol` | `true` | Beta | 1.19 | |
143141
| `ServerSideApply` | `false` | Alpha | 1.14 | 1.15 |
144142
| `ServerSideApply` | `true` | Beta | 1.16 | |
145143
| `ServiceAccountIssuerDiscovery` | `false` | Alpha | 1.18 | |
146-
| `ServiceAppProtocol` | `false` | Alpha | 1.18 | |
144+
| `ServiceAppProtocol` | `false` | Alpha | 1.18 | 1.18 |
145+
| `ServiceAppProtocol` | `true` | Beta | 1.19 | |
147146
| `ServiceNodeExclusion` | `false` | Alpha | 1.8 | 1.18 |
148147
| `ServiceNodeExclusion` | `true` | Beta | 1.19 | |
149148
| `ServiceTopology` | `false` | Alpha | 1.17 | |

content/en/docs/setup/best-practices/node-conformance.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@ daemons installed:
2525
## Running Node Conformance Test
2626

2727
To run the node conformance test, perform the following steps:
28-
29-
1. Point your Kubelet to localhost `--api-servers="http://localhost:8080"`,
30-
because the test framework starts a local master to test Kubelet. There are some
31-
other Kubelet flags you may care:
28+
1. Work out the value of the `--kubeconfig` option for the kubelet; for example:
29+
`--kubeconfig=/var/lib/kubelet/config.yaml`.
30+
Because the test framework starts a local control plane to test the kubelet,
31+
use `http://localhost:8080` as the URL of the API server.
32+
There are some other kubelet command line parameters you may want to use:
3233
* `--pod-cidr`: If you are using `kubenet`, you should specify an arbitrary CIDR
3334
to Kubelet, for example `--pod-cidr=10.180.0.0/24`.
3435
* `--cloud-provider`: If you are using `--cloud-provider=gce`, you should

content/en/docs/setup/production-environment/tools/kubeadm/setup-ha-etcd-with-kubeadm.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ this example.
5050

5151

5252
1. Configure the kubelet to be a service manager for etcd.
53-
53+
5454
{{< note >}}You must do this on every host where etcd should be running.{{< /note >}}
5555
Since etcd was created first, you must override the service priority by creating a new unit file
5656
that has higher precedence than the kubeadm-provided kubelet unit file.
@@ -68,6 +68,12 @@ this example.
6868
systemctl restart kubelet
6969
```
7070
71+
Check the kubelet status to ensure it is running.
72+
73+
```sh
74+
systemctl status kubelet
75+
```
76+
7177
1. Create configuration files for kubeadm.
7278
7379
Generate one kubeadm configuration file for each host that will have an etcd

0 commit comments

Comments
 (0)