Skip to content

Commit 08e6a4b

Browse files
authored
Merge pull request #12 from kubernetes/master
merge from upstream
2 parents e6ee962 + 72b37b1 commit 08e6a4b

File tree

606 files changed

+17604
-11190
lines changed

Some content is hidden

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

606 files changed

+17604
-11190
lines changed

OWNERS_ALIASES

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ aliases:
1010
- kbarnard10
1111
- mrbobbytables
1212
- onlydole
13+
- sftim
1314
sig-docs-de-owners: # Admins for German content
1415
- bene2k1
1516
- mkorbi
@@ -175,14 +176,20 @@ aliases:
175176
# zhangxiaoyu-zidif
176177
sig-docs-pt-owners: # Admins for Portuguese content
177178
- femrtnz
179+
- jailton
178180
- jcjesus
179181
- devlware
180182
- jhonmike
183+
- rikatz
184+
- yagonobre
181185
sig-docs-pt-reviews: # PR reviews for Portugese content
182186
- femrtnz
187+
- jailton
183188
- jcjesus
184189
- devlware
185190
- jhonmike
191+
- rikatz
192+
- yagonobre
186193
sig-docs-vi-owners: # Admins for Vietnamese content
187194
- huynguyennovem
188195
- ngtuna

README-es.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,17 @@ El método recomendado para levantar una copia local del sitio web kubernetes.io
3030
3131
> Si prefiere levantar el sitio web sin utilizar **Docker**, puede seguir las instrucciones disponibles en la sección [Levantando kubernetes.io en local con Hugo](#levantando-kubernetesio-en-local-con-hugo).
3232
33+
**`Nota`: Para el procedimiento de construir una imagen de Docker e iniciar el servidor.**
34+
El sitio web de Kubernetes utiliza Docsy Hugo theme. Se sugiere que se instale si aún no se ha hecho, los **submódulos** y otras dependencias de herramientas de desarrollo ejecutando el siguiente comando de `git`:
35+
36+
```bash
37+
# pull de los submódulos del repositorio
38+
git submodule update --init --recursive --depth 1
39+
40+
```
41+
42+
Si identifica que `git` reconoce una cantidad innumerable de cambios nuevos en el proyecto, la forma más simple de solucionarlo es cerrando y volviendo a abrir el proyecto en el editor. Los submódulos son automáticamente detectados por `git`, pero los plugins usados por los editores pueden tener dificultades para ser cargados.
43+
3344
Una vez tenga Docker [configurado en su máquina](https://www.docker.com/get-started), puede construir la imagen de Docker `kubernetes-hugo` localmente ejecutando el siguiente comando en la raíz del repositorio:
3445

3546
```bash
@@ -73,4 +84,4 @@ La participación en la comunidad de Kubernetes está regulada por el [Código d
7384

7485
Kubernetes es posible gracias a la participación de la comunidad y la documentación es vital para facilitar el acceso al proyecto.
7586

76-
Agradecemos muchísimo sus contribuciones a nuestro sitio web y nuestra documentación.
87+
Agradecemos muchísimo sus contribuciones a nuestro sitio web y nuestra documentación.

README-pt.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,15 @@ sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist
144144

145145
Esta solução funciona tanto para o MacOS Catalina quanto para o MacOS Mojave.
146146

147+
### Erro de "Out of Memory"
148+
149+
Se você executar o comando `make container-serve` e retornar o seguinte erro:
150+
```
151+
make: *** [container-serve] Error 137
152+
```
153+
154+
Verifique a quantidade de memória disponível para o agente de execução de contêiner. No caso do Docker Desktop para macOS, abra o menu "Preferences..." -> "Resources..." e tente disponibilizar mais memória.
155+
147156
# Comunidade, discussão, contribuição e apoio
148157

149158
Saiba mais sobre a comunidade Kubernetes SIG Docs e reuniões na [página da comunidade](http://kubernetes.io/community/).

assets/scss/_base.scss

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -869,3 +869,22 @@ body.td-documentation {
869869
display: none;
870870
}
871871
}
872+
873+
// nav-tabs and tab-content
874+
.nav-tabs {
875+
border-bottom: none !important;
876+
}
877+
878+
.td-content .tab-content .highlight {
879+
margin: 0;
880+
}
881+
882+
.tab-pane {
883+
border-radius: 0.25rem;
884+
padding: 0 16px 16px;
885+
886+
border: 1px solid #dee2e6;
887+
&:first-of-type.active {
888+
border-top-left-radius: 0;
889+
}
890+
}

config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ blog = "/:section/:year/:month/:day/:slug/"
9191
[outputs]
9292
home = [ "HTML", "RSS", "HEADERS" ]
9393
page = [ "HTML"]
94-
section = [ "HTML"]
94+
section = [ "HTML", "print" ]
9595

9696
# Add a "text/netlify" media type for auto-generating the _headers file
9797
[mediaTypes]

content/de/docs/setup/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ content_type: concept
99

1010
Diese Sektion umfasst verschiedene Optionen zum Einrichten und Betrieb von Kubernetes.
1111

12-
Verschiedene Kubernetes Lösungen haben verschiedene Anforderungen: Einfache Wartung, Sicherheit, Kontrolle, verfügbare Resourcen und erforderliches Fachwissen zum Betrieb und zur Verwaltung dess folgende Diagramm zeigt die möglichen Abstraktionen eines Kubernetes-Clusters und ob eine Abstraktion selbst verwaltet oder von einem Anbieter verwaltet wird.
12+
Verschiedene Kubernetes Lösungen haben verschiedene Anforderungen: Einfache Wartung, Sicherheit, Kontrolle, verfügbare Resourcen und erforderliches Fachwissen zum Betrieb und zur Verwaltung. Das folgende Diagramm zeigt die möglichen Abstraktionen eines Kubernetes-Clusters und ob eine Abstraktion selbst verwaltet oder von einem Anbieter verwaltet wird.
1313

1414
Sie können einen Kubernetes-Cluster auf einer lokalen Maschine, Cloud, On-Prem Datacenter bereitstellen; oder wählen Sie einen verwalteten Kubernetes-Cluster. Sie können auch eine individuelle Lösung über eine grosse Auswahl an Cloud Anbietern oder Bare-Metal-Umgebungen nutzen.
1515

content/en/blog/_posts/2017-03-00-Advanced-Scheduling-In-Kubernetes.md

Lines changed: 30 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,14 @@ For example, if we want to require scheduling on a node that is in the us-centra
2020

2121

2222
```
23-
affinity:
24-
25-
nodeAffinity:
26-
27-
requiredDuringSchedulingIgnoredDuringExecution:
28-
29-
nodeSelectorTerms:
30-
31-
- matchExpressions:
32-
33-
- key: "failure-domain.beta.kubernetes.io/zone"
34-
35-
operator: In
36-
37-
values: ["us-central1-a"]
23+
affinity:
24+
nodeAffinity:
25+
requiredDuringSchedulingIgnoredDuringExecution:
26+
nodeSelectorTerms:
27+
- matchExpressions:
28+
- key: "failure-domain.beta.kubernetes.io/zone"
29+
operator: In
30+
values: ["us-central1-a"]
3831
```
3932

4033

@@ -44,21 +37,14 @@ Preferred rules mean that if nodes match the rules, they will be chosen first, a
4437

4538

4639
```
47-
affinity:
48-
49-
nodeAffinity:
50-
51-
preferredDuringSchedulingIgnoredDuringExecution:
52-
53-
nodeSelectorTerms:
54-
55-
- matchExpressions:
56-
57-
- key: "failure-domain.beta.kubernetes.io/zone"
58-
59-
operator: In
60-
61-
values: ["us-central1-a"]
40+
affinity:
41+
nodeAffinity:
42+
preferredDuringSchedulingIgnoredDuringExecution:
43+
nodeSelectorTerms:
44+
- matchExpressions:
45+
- key: "failure-domain.beta.kubernetes.io/zone"
46+
operator: In
47+
values: ["us-central1-a"]
6248
```
6349

6450

@@ -67,21 +53,14 @@ Node anti-affinity can be achieved by using negative operators. So for instance
6753

6854

6955
```
70-
affinity:
71-
72-
nodeAffinity:
73-
74-
requiredDuringSchedulingIgnoredDuringExecution:
75-
76-
nodeSelectorTerms:
77-
78-
- matchExpressions:
79-
80-
- key: "failure-domain.beta.kubernetes.io/zone"
81-
82-
operator: NotIn
83-
84-
values: ["us-central1-a"]
56+
affinity:
57+
nodeAffinity:
58+
requiredDuringSchedulingIgnoredDuringExecution:
59+
nodeSelectorTerms:
60+
- matchExpressions:
61+
- key: "failure-domain.beta.kubernetes.io/zone"
62+
operator: NotIn
63+
values: ["us-central1-a"]
8564
```
8665

8766

@@ -99,23 +78,19 @@ The kubectl command allows you to set taints on nodes, for example:
9978

10079
```
10180
kubectl taint nodes node1 key=value:NoSchedule
102-
```
81+
```
10382

10483

10584
creates a taint that marks the node as unschedulable by any pods that do not have a toleration for taint with key key, value value, and effect NoSchedule. (The other taint effects are PreferNoSchedule, which is the preferred version of NoSchedule, and NoExecute, which means any pods that are running on the node when the taint is applied will be evicted unless they tolerate the taint.) The toleration you would add to a PodSpec to have the corresponding pod tolerate this taint would look like this
10685

10786

10887

10988
```
110-
tolerations:
111-
112-
- key: "key"
113-
114-
operator: "Equal"
115-
116-
value: "value"
117-
118-
effect: "NoSchedule"
89+
tolerations:
90+
- key: "key"
91+
operator: "Equal"
92+
value: "value"
93+
effect: "NoSchedule"
11994
```
12095

12196

@@ -138,21 +113,13 @@ Let’s look at an example. Say you have front-ends in service S1, and they comm
138113

139114
```
140115
affinity:
141-
142116
podAffinity:
143-
144117
requiredDuringSchedulingIgnoredDuringExecution:
145-
146118
- labelSelector:
147-
148119
matchExpressions:
149-
150120
- key: service
151-
152121
operator: In
153-
154122
values: [“S1”]
155-
156123
topologyKey: failure-domain.beta.kubernetes.io/zone
157124
```
158125

@@ -172,25 +139,15 @@ Here we have a Pod where we specify the schedulerName field:
172139

173140
```
174141
apiVersion: v1
175-
176142
kind: Pod
177-
178143
metadata:
179-
180144
name: nginx
181-
182145
labels:
183-
184146
app: nginx
185-
186147
spec:
187-
188148
schedulerName: my-scheduler
189-
190149
containers:
191-
192150
- name: nginx
193-
194151
image: nginx:1.10
195152
```
196153

content/en/blog/_posts/2018-08-03-make-kubernetes-production-grade-anywhere.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Cluster-distributed stateful services (e.g., Cassandra) can benefit from splitti
176176

177177
[Logs](/docs/concepts/cluster-administration/logging/) and [metrics](/docs/tasks/debug-application-cluster/resource-usage-monitoring/) (if collected and persistently retained) are valuable to diagnose outages, but given the variety of technologies available it will not be addressed in this blog. If Internet connectivity is available, it may be desirable to retain logs and metrics externally at a central location.
178178

179-
Your production deployment should utilize an automated installation, configuration and update tool (e.g., [Ansible](https://github.com/kubernetes-incubator/kubespray), [BOSH](https://github.com/cloudfoundry-incubator/kubo-deployment), [Chef](https://github.com/chef-cookbooks/kubernetes), [Juju](/docs/getting-started-guides/ubuntu/installation/), [kubeadm](/docs/reference/setup-tools/kubeadm/kubeadm/), [Puppet](https://forge.puppet.com/puppetlabs/kubernetes), etc.). A manual process will have repeatability issues, be labor intensive, error prone, and difficult to scale. [Certified distributions](https://www.cncf.io/certification/software-conformance/#logos) are likely to include a facility for retaining configuration settings across updates, but if you implement your own install and config toolchain, then retention, backup and recovery of the configuration artifacts is essential. Consider keeping your deployment components and settings under a version control system such as Git.
179+
Your production deployment should utilize an automated installation, configuration and update tool (e.g., [Ansible](https://github.com/kubernetes-incubator/kubespray), [BOSH](https://github.com/cloudfoundry-incubator/kubo-deployment), [Chef](https://github.com/chef-cookbooks/kubernetes), [Juju](/docs/getting-started-guides/ubuntu/installation/), [kubeadm](/docs/reference/setup-tools/kubeadm/), [Puppet](https://forge.puppet.com/puppetlabs/kubernetes), etc.). A manual process will have repeatability issues, be labor intensive, error prone, and difficult to scale. [Certified distributions](https://www.cncf.io/certification/software-conformance/#logos) are likely to include a facility for retaining configuration settings across updates, but if you implement your own install and config toolchain, then retention, backup and recovery of the configuration artifacts is essential. Consider keeping your deployment components and settings under a version control system such as Git.
180180

181181
## Outage recovery
182182

content/en/blog/_posts/2018-12-03-kubernetes-1-13-release-announcement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Let’s dive into the key features of this release:
1717

1818
## Simplified Kubernetes Cluster Management with kubeadm in GA
1919

20-
Most people who have gotten hands-on with Kubernetes have at some point been hands-on with kubeadm. It's an essential tool for managing the cluster lifecycle, from creation to configuration to upgrade; and now kubeadm is officially GA. [kubeadm](/docs/reference/setup-tools/kubeadm/kubeadm/) handles the bootstrapping of production clusters on existing hardware and configuring the core Kubernetes components in a best-practice-manner to providing a secure yet easy joining flow for new nodes and supporting easy upgrades. What’s notable about this GA release are the now graduated advanced features, specifically around pluggability and configurability. The scope of kubeadm is to be a toolbox for both admins and automated, higher-level system and this release is a significant step in that direction.
20+
Most people who have gotten hands-on with Kubernetes have at some point been hands-on with kubeadm. It's an essential tool for managing the cluster lifecycle, from creation to configuration to upgrade; and now kubeadm is officially GA. [kubeadm](/docs/reference/setup-tools/kubeadm/) handles the bootstrapping of production clusters on existing hardware and configuring the core Kubernetes components in a best-practice-manner to providing a secure yet easy joining flow for new nodes and supporting easy upgrades. What’s notable about this GA release are the now graduated advanced features, specifically around pluggability and configurability. The scope of kubeadm is to be a toolbox for both admins and automated, higher-level system and this release is a significant step in that direction.
2121

2222
## Container Storage Interface (CSI) Goes GA
2323

content/en/blog/_posts/2019-03-15-Kubernetes-setup-using-Ansible-and-Vagrant.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ Vagrant.configure("2") do |config|
6666
end
6767
end
6868
end
69+
end
6970
```
7071

7172
### Step 2: Create an Ansible playbook for Kubernetes master.

0 commit comments

Comments
 (0)