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

Merged master into dev 1.21 - 2/12/21 #26488

Merged
merged 115 commits into from
Feb 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
115 commits
Select commit Hold shift + click to select a range
dee9866
Fix links MD syntax typo in FR documentation
bobsaintcool Oct 24, 2020
8df84e2
Fix links MD syntax typo in FR documentation
bobsaintcool Oct 24, 2020
ddb1f75
Merge branch 'dev-1.19-fr.1' of bobsaintcool.github.com:bobsaintcool/…
bobsaintcool Oct 24, 2020
4237738
docs: add partition field for EBS
chiehmin Nov 16, 2020
845a885
Add a caution message on CronJob Controller workload if using startin…
salva-gglez Dec 6, 2020
d38c741
Update content/en/docs/concepts/workloads/controllers/cron-jobs.md
salva-gglez Dec 6, 2020
18b8846
Update cron-jobs.md
salva-gglez Dec 8, 2020
6ea9106
Add special localization documentation for Bahasa Indonesia.
ariscahyadi Dec 10, 2020
75c5998
fix: errors in base64 and sed commands
zwindler Dec 14, 2020
4bf6c31
remove misleading instructions
puckpuck Dec 23, 2020
364b9e9
Replaced the Old Diagrams in Expose Intro Page
Dec 25, 2020
2630078
Clarify binaryData handling by kubectl create and describe
schollii Jan 7, 2021
929bfc9
Update deployment.md
xiaoping378 Jan 10, 2021
c398ae4
Update content/en/docs/tasks/configure-pod-container/configure-pod-co…
schollii Jan 13, 2021
09cdaac
Add Kubernetes project values to community page
mrbobbytables Jan 13, 2021
06228c0
Fix examples tests
tengqm Oct 26, 2020
9cc4fde
Remove v2 controller mention
salva-gglez Jan 17, 2021
99029b9
Remove Master/Slave terminology from stateless application tutorial.
paulczar Aug 3, 2020
d56ac69
Add instruction to access API reference pages URL locally
jailton Jan 23, 2021
e4d2412
Redirects "Well-Known Labels, Annotations and Taints" page
feloy Jan 23, 2021
e239d80
Replace alpine with busybox image for better response from nslookup
nareshlakyajagadisha Oct 16, 2020
bb80868
Use https for link to contributor covenant
npu21 Jan 28, 2021
2ddacf2
Use https for link to contributor covenant
npu21 Jan 28, 2021
14afc4d
[zh] Translate kubelet-tls-bootstrapping
tengqm Jan 20, 2021
15be3b1
[zh] Resync connecting-frontend-backend
tengqm Jan 30, 2021
72f4f64
:wrench: Modify Kompose page, to remove up
nasirhm Jan 31, 2021
bfea67a
Clarify PreStop hook behaviour
dippynark Feb 1, 2021
b84e52e
Update README.md
jailton Feb 1, 2021
30d887e
[zh] Resync configure-liveness-readiness-startup-probes
tengqm Jan 31, 2021
e54d16c
[zh] Sych web page for topo manager
chenxuc Feb 3, 2021
57e1fcd
fix fullwidth `!`
HollowMan6 Feb 4, 2021
a0c2963
Update README-pt.md
jailton Feb 4, 2021
96c4813
revise guidance for Pascal Case
geoffcline Dec 8, 2020
69ce4cd
Add all docs-id reviewers as owners
girikuncoro Feb 5, 2021
42da03e
Merge pull request #26380 from HollowMan6/patch-1
k8s-ci-robot Feb 6, 2021
ce6620d
Merge pull request #26298 from tengqm/zh-sync-connecting-fb
k8s-ci-robot Feb 6, 2021
6db9ea6
Merge pull request #26170 from tengqm/zh-trans-kubelet-tls
k8s-ci-robot Feb 6, 2021
fa2b8c8
Merge pull request #26363 from chenxuc/topo-manager
k8s-ci-robot Feb 6, 2021
0295195
[zh] translate check if dockershim affects you
zhiguo-lu Feb 5, 2021
a8128d2
Merge pull request #26264 from npu21/conduct_fr
k8s-ci-robot Feb 6, 2021
4353211
Merge pull request #26026 from xiaoping378/patch-1
k8s-ci-robot Feb 6, 2021
947281b
Merge pull request #26323 from nasirhm/kompose_up_removal_line
k8s-ci-robot Feb 6, 2021
99e31e5
Merge pull request #26265 from npu21/conduct_vi
k8s-ci-robot Feb 6, 2021
fb8b89d
Merge pull request #26207 from jailton/en/update-readme-20210122
k8s-ci-robot Feb 6, 2021
c02a6c0
Merge pull request #26086 from tengqm/fix-example-tests
k8s-ci-robot Feb 6, 2021
fde6159
Merge pull request #26218 from feloy/redirect-well-known-labels-page
k8s-ci-robot Feb 6, 2021
58312c2
Merge pull request #24603 from ljnaresh/bug-21436
k8s-ci-robot Feb 6, 2021
6c6e697
Merge pull request #26068 from mrbobbytables/add-values
k8s-ci-robot Feb 6, 2021
a8dabfd
Merge pull request #25545 from ariscahyadi/id-localization-guide
k8s-ci-robot Feb 6, 2021
ceaf75b
Merge pull request #26314 from tengqm/zh-sync-probes
k8s-ci-robot Feb 7, 2021
89603ec
Merge pull request #26396 from zhiguo-lu/zh-trans-check-dockershim-de…
k8s-ci-robot Feb 7, 2021
af76e77
Merge pull request #26141 from jimangel/remove-redis-and-master-slave…
k8s-ci-robot Feb 7, 2021
64b63c0
Merge pull request #24645 from geoffcline/patch-2
k8s-ci-robot Feb 7, 2021
f539da6
Merge pull request #25425 from salva-gglez/caution_startingDeadlineSe…
k8s-ci-robot Feb 7, 2021
39edec0
Merge pull request #25814 from mehmetefeumit/master
k8s-ci-robot Feb 7, 2021
6c1ffd3
Fail links in compute-device-assignment.md
ydFu Feb 7, 2021
d5d4877
translate 2020-10-01
ldsdsy Feb 5, 2021
3fd6548
clean up use of word: simply
kbhawkey Feb 4, 2021
5ed2b71
[zh] Tidy list of generators for “kubectl create”
Arhell Feb 7, 2021
4f2070d
Merge pull request #26402 from ldsdsy/translate_2020_10_01
k8s-ci-robot Feb 8, 2021
b3bf683
Merge pull request #26418 from Arhell/list
k8s-ci-robot Feb 8, 2021
a0325b1
Update taint-and-toleration.md
childe Feb 8, 2021
af40c89
Update Kompose version from 1.21.0 to 1.22.0
paranlee Feb 8, 2021
2e78b33
Merge pull request #25775 from puckpuck/patch-1
k8s-ci-robot Feb 8, 2021
e6fb782
Merge pull request #26421 from childe/patch-1
k8s-ci-robot Feb 8, 2021
892aedc
Address review comments
dippynark Feb 8, 2021
cbf7a63
Add comma
dippynark Feb 8, 2021
c036f87
Merge pull request #26397 from girikuncoro/docs-id-owner
k8s-ci-robot Feb 8, 2021
8637bc9
Merge pull request #26350 from dippynark/clarify-pre-stop-hook-descri…
k8s-ci-robot Feb 8, 2021
7b04c3a
Merge pull request #26422 from paranlee/patch-1
k8s-ci-robot Feb 8, 2021
6b19266
fix indentation
yaodingyd Feb 8, 2021
db79dab
Merge pull request #26388 from jailton/pt/update-readme-20210204
k8s-ci-robot Feb 8, 2021
15afafb
Merge pull request #24706 from bobsaintcool/dev-1.19-fr.1
k8s-ci-robot Feb 8, 2021
da2d988
[zh] update docker-cli-to-kubectl
Arhell Feb 8, 2021
d0a532e
Merge pull request #26430 from Arhell/upd
k8s-ci-robot Feb 9, 2021
e6ee962
Merge pull request #11 from kubernetes/master
npu21 Feb 9, 2021
0ec9593
Dual-stack docs correction
npu21 Feb 9, 2021
188ccc2
Clairly Resourcequota limit for PriorityClass
Jan 28, 2021
539e524
Merge pull request #26273 from Cweiping/feature/clairly_resource_quot…
k8s-ci-robot Feb 9, 2021
c24f62c
Merge pull request #26389 from kbhawkey/fixup-simply-usage
k8s-ci-robot Feb 9, 2021
ecbbb15
[zh] translate Migrating telemetry and security agents from dockershim
zhiguo-lu Feb 7, 2021
1f3478e
Merge pull request #26435 from npu21/dualstack_en
k8s-ci-robot Feb 9, 2021
70ebc7f
Update ephemeral-containers.md
yaodingyd Feb 9, 2021
ee5b6e8
Add content/pt/docs/tutorials/hello-minikube.md
jailton Feb 9, 2021
52f3543
service-network: add some clarity to headless service
binchenX Feb 10, 2021
ddf8d77
Fix column alignment in debug-service.md
jacksgt Feb 10, 2021
484df55
Merge pull request #26429 from yaodingyd/patch-1
k8s-ci-robot Feb 10, 2021
739c65c
Merge pull request #26451 from jacksgt/patch-1
k8s-ci-robot Feb 10, 2021
8377d08
Merge pull request #25986 from schollii/master
k8s-ci-robot Feb 10, 2021
a1f5566
remove command from output block
oke-py Feb 10, 2021
5d973fa
Fix typos in file docs/tutorials/hello-minikube.md
jailton Feb 10, 2021
ca018cf
Merge pull request #26453 from oke-py/style
k8s-ci-robot Feb 10, 2021
dc4836b
Minor - Systemd enable command to enable CRI-O at boot time
eTimS Feb 10, 2021
3c22c23
Merge pull request #26446 from pierrchen/headless
k8s-ci-robot Feb 10, 2021
f26aab7
Fix typo in file docs/tutorials/hello-minikube.md
jailton Feb 10, 2021
a4e48ec
Merge pull request #26440 from jailton/pt/docs/tutorials
k8s-ci-robot Feb 10, 2021
f4a96f4
Update content/en/docs/setup/production-environment/container-runtime…
eTimS Feb 10, 2021
9a3347c
security: add container runtime class as an option to provider extra …
binchenX Feb 10, 2021
a33e903
Clarify selection of default HPA scaling policy
jacksgt Feb 10, 2021
107f4a7
Merge pull request #26452 from jacksgt/patch-1
k8s-ci-robot Feb 11, 2021
734865f
Merge pull request #26412 from ydFu/fix-url-issue-26382
k8s-ci-robot Feb 11, 2021
23d70ea
Merge pull request #26409 from zhiguo-lu/zh-trans-task-migrating-tele…
k8s-ci-robot Feb 11, 2021
e0e68de
style: separate commands from output
oke-py Feb 11, 2021
e13caad
fix an invalid location.hash
oke-py Feb 11, 2021
3ff53ef
Merge pull request #26467 from oke-py/invalid-hash
k8s-ci-robot Feb 11, 2021
632bd32
Merge pull request #26456 from eTimS/patch-2
k8s-ci-robot Feb 11, 2021
f141a3c
fix: add missing end
mccricardo Feb 11, 2021
9afb531
Merge pull request #26458 from pierrchen/runtimeclass
k8s-ci-robot Feb 11, 2021
e512e4e
Merge pull request #25619 from zwindler/patch-1
k8s-ci-robot Feb 12, 2021
d99604b
Merge pull request #26471 from mccricardo/fix/missing-end
k8s-ci-robot Feb 12, 2021
d5105b5
Merge pull request #26464 from oke-py/style
k8s-ci-robot Feb 12, 2021
69e0994
chore: fix a broken link "FrameworkHandle"
oke-py Feb 12, 2021
6af44ed
Merge pull request #26480 from oke-py/26479
k8s-ci-robot Feb 12, 2021
0a0dc4d
Merge pull request #25022 from chiehmin/add-parition-field-for-ebs
k8s-ci-robot Feb 12, 2021
bfcea97
Merge remote-tracking branch 'upstream/master' into dev-1.21
ChandaniM123 Feb 13, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions OWNERS_ALIASES
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,21 @@ aliases:
- daminisatya
- mittalyashu
sig-docs-id-owners: # Admins for Indonesian content
- ariscahyadi
- danninov
- girikuncoro
- habibrosyad
- irvifa
- phanama
- wahyuoi
sig-docs-id-reviews: # PR reviews for Indonesian content
- ariscahyadi
- danninov
- girikuncoro
- habibrosyad
- irvifa
- wahyuoi
- phanama
- danninov
- wahyuoi
sig-docs-it-owners: # Admins for Italian content
- fabriziopandini
- Fale
Expand Down
61 changes: 54 additions & 7 deletions README-pt.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

[![Netlify Status](https://api.netlify.com/api/v1/badges/be93b718-a6df-402a-b4a4-855ba186c97d/deploy-status)](https://app.netlify.com/sites/kubernetes-io-master-staging/deploys) [![GitHub release](https://img.shields.io/github/release/kubernetes/website.svg)](https://github.com/kubernetes/website/releases/latest)

Bem vindos! Este repositório abriga todos os recursos necessários para criar o [website e documentação do Kubernetes](https://kubernetes.io/). Estamos muito satisfeitos por você querer contribuir!
Bem-vindos! Este repositório contém todos os recursos necessários para criar o [website e documentação do Kubernetes](https://kubernetes.io/). Estamos muito satisfeitos por você querer contribuir!

# Utilizando este repositório

Você pode executar o website localmente utilizando o Hugo (versão Extended), ou você pode executa-ló em um container runtime. É altamente recomendável usar um container runtime, pois garante a consistência na implantação do website real.
Você pode executar o website localmente utilizando o Hugo (versão Extended), ou você pode executa-ló em um container runtime. É altamente recomendável utilizar um container runtime, pois garante a consistência na implantação do website real.

## Pré-requisitos

Expand Down Expand Up @@ -40,7 +40,7 @@ make container-image
make container-serve
```

Abra seu navegador em http://localhost:1313 para visualizar o website. Conforme você faz alterações nos arquivos fontes, Hugo atualiza o website e força a atualização do navegador.
Abra seu navegador em http://localhost:1313 para visualizar o website. Conforme você faz alterações nos arquivos fontes, o Hugo atualiza o website e força a atualização do navegador.

## Executando o website localmente utilizando o Hugo

Expand All @@ -56,10 +56,57 @@ make serve

Isso iniciará localmente o Hugo na porta 1313. Abra o seu navegador em http://localhost:1313 para visualizar o website. Conforme você faz alterações nos arquivos fontes, o Hugo atualiza o website e força uma atualização no navegador.

## Construindo a página de referência da API

A página de referência da API localizada em `content/en/docs/reference/kubernetes-api` é construída a partir da especificação do Swagger utilizando https://github.com/kubernetes-sigs/reference-docs/tree/master/gen-resourcesdocs.

Siga os passos abaixo para atualizar a página de referência para uma nova versão do Kubernetes:

OBS: modifique o "v1.20" no exemplo a seguir pela versão a ser atualizada

1. Obter o submódulo `kubernetes-resources-reference`:

```
git submodule update --init --recursive --depth 1
```

2. Criar a nova versão da API no submódulo e adicionar à especificação do Swagger:

```
mkdir api-ref-generator/gen-resourcesdocs/api/v1.20
curl 'https://raw.githubusercontent.com/kubernetes/kubernetes/master/api/openapi-spec/swagger.json' > api-ref-generator/gen-resourcesdocs/api/v1.20/swagger.json
```

3. Copiar o sumário e os campos de configuração para a nova versão a partir da versão anterior:

```
mkdir api-ref-generator/gen-resourcesdocs/api/v1.20
cp api-ref-generator/gen-resourcesdocs/api/v1.19/* api-ref-generator/gen-resourcesdocs/api/v1.20/
```

4. Ajustar os arquivos `toc.yaml` e `fields.yaml` para refletir as mudanças entre as duas versões.

5. Em seguida, gerar as páginas:

```
make api-reference
```

Você pode validar o resultado localmente gerando e disponibilizando o site a partir da imagem do container:

```
make container-image
make container-serve
```

Abra o seu navegador em http://localhost:1313/docs/reference/kubernetes-api/ para visualizar a página de referência da API.

6. Quando todas as mudanças forem refletidas nos arquivos de configuração `toc.yaml` e `fields.yaml`, crie um pull request com a nova página de referência de API.

## Troubleshooting
### error: failed to transform resource: TOCSS: failed to transform "scss/main.scss" (text/x-scss): this feature is not available in your current Hugo version

Por motivos técnicos, o Hugo é disponibilizado em dois conjuntos de binários. O website atual funciona apenas na versão **Hugo Extended**. Na [página de releases](https://github.com/gohugoio/hugo/releases) procure por arquivos com `extended` no nome. Para confirmar, execute `hugo version` e procure pela palavra `extended`.
Por motivos técnicos, o Hugo é disponibilizado em dois conjuntos de binários. O website atual funciona apenas na versão **Hugo Extended**. Na [página de releases](https://github.com/gohugoio/hugo/releases) procure por arquivos com `extended` no nome. Para confirmar, execute `hugo version` e procure pela palavra `extended`.

### Troubleshooting macOS for too many open files

Expand Down Expand Up @@ -110,9 +157,9 @@ Você também pode entrar em contato com os mantenedores deste projeto em:

Você pode clicar no botão **Fork** na área superior direita da tela para criar uma cópia desse repositório na sua conta do GitHub. Esta cópia é chamada de *fork*. Faça as alterações desejadas no seu fork e, quando estiver pronto para enviar as alterações para nós, vá até o fork e crie um novo **pull request** para nos informar sobre isso.

Depois que seu **pull request** for criado, um revisor do Kubernetes assumirá a responsabilidade de fornecer um feedback claro e objetivo. Como proprietário do pull request, **é sua responsabilidade modificar seu pull request para atender ao feedback que foi fornecido a você pelo revisor do Kubernetes.**
Depois que seu **pull request** for criado, um revisor do Kubernetes assumirá a responsabilidade de fornecer um feedback claro e objetivo. Como proprietário do pull request, **é sua responsabilidade modificar seu pull request para atender ao feedback que foi fornecido a você pelo revisor do Kubernetes.**

Observe também que você pode acabar tendo mais de um revisor do Kubernetes para fornecer seu feedback ou você pode acabar obtendo feedback de um outro revisor do Kubernetes diferente daquele originalmente designado para lhe fornecer o feedback.
Observe também que você pode acabar tendo mais de um revisor do Kubernetes para fornecer seu feedback ou você pode acabar obtendo feedback de um outro revisor do Kubernetes diferente daquele originalmente designado para lhe fornecer o feedback.

Além disso, em alguns casos, um de seus revisores pode solicitar uma revisão técnica de um [revisor técnico do Kubernetes](https://github.com/kubernetes/website/wiki/Tech-reviewers) quando necessário. Os revisores farão o melhor para fornecer feedbacks em tempo hábil, mas o tempo de resposta pode variar de acordo com as circunstâncias.

Expand All @@ -134,4 +181,4 @@ A participação na comunidade Kubernetes é regida pelo [Código de Conduta da

# Obrigado!

O Kubernetes conta com a participação da comunidade e nós realmente agradecemos suas contribuições para o nosso website e nossa documentação!
O Kubernetes prospera com a participação da comunidade e nós realmente agradecemos suas contribuições para o nosso website e nossa documentação!
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ make container-image
make container-serve
```

In a web browser, go to http://localhost:1313/docs/reference/kubernetes-api/ to view the API reference.

6. When all changes of the new contract are reflected into the configuration files `toc.yaml` and `fields.yaml`, create a Pull Request with the newly generated API reference pages.

## Troubleshooting
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ Vagrant.configure("2") do |config|
end
end
end
end
```

### Step 2: Create an Ansible playbook for Kubernetes master.
Expand Down
23 changes: 21 additions & 2 deletions content/en/community/_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

<div class="community__navbar">

<a href="#values">Community Values</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a href="#conduct">Code of conduct </a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a href="#videos">Videos</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a href="#discuss">Discussions</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
Expand All @@ -41,10 +42,28 @@
<img src="/images/community/kubernetes-community-final-05.jpg" alt="Kubernetes Conference Gallery" style="width:100%;margin-right:0% important" class="desktop">
</div>
<img src="/images/community/kubernetes-community-04-mobile.jpg" alt="Kubernetes Conference Gallery" style="width:100%;margin-bottom:3%" class="mobile">

<a name="conduct"></a>
<a name="values"></a>
</div>

<div><a name="values"></a></div>
<div class="conduct">
<div class="conducttext">
<br class="mobile"><br class="mobile">
<br class="tablet"><br class="tablet">
<div class="conducttextnobutton" style="margin-bottom:2%"><h1>Community Values</h1>
The Kubernetes Community values are the keystone to the ongoing success of the project.<br>
These principles guide every aspect of the Kubernetes project.
<br>
<a href="/community/values/">
<br class="mobile"><br class="mobile">
<span class="fullbutton">
READ MORE
</span>
</a>
</div><a name="conduct"></a>
</div>
</div>



<div class="conduct">
Expand Down
28 changes: 28 additions & 0 deletions content/en/community/static/community-values.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<!-- Do not edit this file directly. Get the latest from
https://git.k8s.io/community/values.md -->

# Kubernetes Community Values

Kubernetes Community culture is frequently cited as a substantial contributor to the meteoric rise of this Open Source project. Below are the distilled values which have evolved over the last many years in our community pushing our project and peers toward constant improvement.

## Distribution is better than centralization

The scale of the Kubernetes project is only viable through high-trust and high-visibility distribution of work, which includes delegation of authority, decision making, technical design, code ownership, and documentation. Distributed asynchronous ownership, collaboration, communication and decision making are the cornerstone of our world-wide community.

## Community over product or company

We are here as a community first, our allegiance is to the intentional stewardship of the Kubernetes project for the benefit of all its members and users everywhere. We support working together publicly for the common goal of a vibrant interoperable ecosystem providing an excellent experience for our users. Individuals gain status through work, companies gain status through their commitments to support this community and fund the resources necessary for the project to operate.

## Automation over process

Large projects have a lot of less exciting, yet, hard work. We value time spent automating repetitive work more highly than toil. Where that work cannot be automated, it is our culture to recognize and reward all types of contributions. However, heroism is not sustainable.

## Inclusive is better than exclusive

Broadly successful and useful technology requires different perspectives and skill sets which can only be heard in a welcoming and respectful environment. Community membership is a privilege, not a right. Community Leadership is earned through effort, scope, quality, quantity, and duration of contributions. Our community shows respect for the time and effort put into a discussion regardless of where a contributor is on their growth path.

## Evolution is better than stagnation

Openness to new ideas and studied technological evolution make Kubernetes a stronger project. Continual improvement, servant leadership, mentorship and respect are the foundations of the Kubernetes project culture. It is the duty for leaders in the Kubernetes community to find, sponsor, and promote new community members. Leaders should expect to step aside. Community members should expect to step up.

**"Culture eats strategy for breakfast." --Peter Drucker**
13 changes: 13 additions & 0 deletions content/en/community/values.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
title: Community
layout: basic
cid: community
css: /css/community.css
---

<div class="community_main">

<div class="cncf_coc_container">
{{< include "/static/community-values.md" >}}
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ kubectl apply -f https://k8s.io/examples/application/nginx/

`kubectl` will read any files with suffixes `.yaml`, `.yml`, or `.json`.

It is a recommended practice to put resources related to the same microservice or application tier into the same file, and to group all of the files associated with your application in the same directory. If the tiers of your application bind to each other using DNS, then you can then simply deploy all of the components of your stack en masse.
It is a recommended practice to put resources related to the same microservice or application tier into the same file, and to group all of the files associated with your application in the same directory. If the tiers of your application bind to each other using DNS, you can deploy all of the components of your stack together.

A URL can also be specified as a configuration source, which is handy for deploying directly from configuration files checked into github:

Expand Down Expand Up @@ -265,7 +265,7 @@ For a more concrete example, check the [tutorial of deploying Ghost](https://git
## Updating labels

Sometimes existing pods and other resources need to be relabeled before creating new resources. This can be done with `kubectl label`.
For example, if you want to label all your nginx pods as frontend tier, simply run:
For example, if you want to label all your nginx pods as frontend tier, run:

```shell
kubectl label pods -l app=nginx tier=fe
Expand Down Expand Up @@ -411,7 +411,7 @@ and

## Disruptive updates

In some cases, you may need to update resource fields that cannot be updated once initialized, or you may just want to make a recursive change immediately, such as to fix broken pods created by a Deployment. To change such fields, use `replace --force`, which deletes and re-creates the resource. In this case, you can simply modify your original configuration file:
In some cases, you may need to update resource fields that cannot be updated once initialized, or you may just want to make a recursive change immediately, such as to fix broken pods created by a Deployment. To change such fields, use `replace --force`, which deletes and re-creates the resource. In this case, you can modify your original configuration file:

```shell
kubectl replace -f https://k8s.io/examples/application/nginx/nginx-deployment.yaml --force
Expand Down Expand Up @@ -448,7 +448,7 @@ kubectl scale deployment my-nginx --current-replicas=1 --replicas=3
deployment.apps/my-nginx scaled
```

To update to version 1.16.1, simply change `.spec.template.spec.containers[0].image` from `nginx:1.14.2` to `nginx:1.16.1`, with the kubectl commands we learned above.
To update to version 1.16.1, change `.spec.template.spec.containers[0].image` from `nginx:1.14.2` to `nginx:1.16.1` using the previous kubectl commands.

```shell
kubectl edit deployment/my-nginx
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/concepts/configuration/configmap.md
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ The kubelet checks whether the mounted ConfigMap is fresh on every periodic sync
However, the kubelet uses its local cache for getting the current value of the ConfigMap.
The type of the cache is configurable using the `ConfigMapAndSecretChangeDetectionStrategy` field in
the [KubeletConfiguration struct](https://github.com/kubernetes/kubernetes/blob/{{< param "docsbranch" >}}/staging/src/k8s.io/kubelet/config/v1beta1/types.go).
A ConfigMap can be either propagated by watch (default), ttl-based, or simply redirecting
A ConfigMap can be either propagated by watch (default), ttl-based, or by redirecting
all requests directly to the API server.
As a result, the total delay from the moment when the ConfigMap is updated to the moment
when new keys are projected to the Pod can be as long as the kubelet sync period + cache
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/concepts/configuration/secret.md
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ The kubelet checks whether the mounted secret is fresh on every periodic sync.
However, the kubelet uses its local cache for getting the current value of the Secret.
The type of the cache is configurable using the `ConfigMapAndSecretChangeDetectionStrategy` field in
the [KubeletConfiguration struct](https://github.com/kubernetes/kubernetes/blob/{{< param "docsbranch" >}}/staging/src/k8s.io/kubelet/config/v1beta1/types.go).
A Secret can be either propagated by watch (default), ttl-based, or simply redirecting
A Secret can be either propagated by watch (default), ttl-based, or by redirecting
all requests directly to the API server.
As a result, the total delay from the moment when the Secret is updated to the moment
when new keys are projected to the Pod can be as long as the kubelet sync period + cache
Expand Down
33 changes: 16 additions & 17 deletions content/en/docs/concepts/containers/container-lifecycle-hooks.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,13 @@ No parameters are passed to the handler.

`PreStop`

This hook is called immediately before a container is terminated due to an API request or management event such as liveness probe failure, preemption, resource contention and others. A call to the preStop hook fails if the container is already in terminated or completed state.
It is blocking, meaning it is synchronous,
so it must complete before the signal to stop the container can be sent.
No parameters are passed to the handler.
This hook is called immediately before a container is terminated due to an API request or management
event such as a liveness/startup probe failure, preemption, resource contention and others. A call
to the `PreStop` hook fails if the container is already in a terminated or completed state and the
hook must complete before the TERM signal to stop the container can be sent. The Pod's termination
grace period countdown begins before the `PreStop` hook is executed, so regardless of the outcome of
the handler, the container will eventually terminate within the Pod's termination grace period. No
parameters are passed to the handler.

A more detailed description of the termination behavior can be found in
[Termination of Pods](/docs/concepts/workloads/pods/pod-lifecycle/#pod-termination).
Expand All @@ -65,19 +68,15 @@ the Container ENTRYPOINT and hook fire asynchronously.
However, if the hook takes too long to run or hangs,
the Container cannot reach a `running` state.

`PreStop` hooks are not executed asynchronously from the signal
to stop the Container; the hook must complete its execution before
the signal can be sent.
If a `PreStop` hook hangs during execution,
the Pod's phase will be `Terminating` and remain there until the Pod is
killed after its `terminationGracePeriodSeconds` expires.
This grace period applies to the total time it takes for both
the `PreStop` hook to execute and for the Container to stop normally.
If, for example, `terminationGracePeriodSeconds` is 60, and the hook
takes 55 seconds to complete, and the Container takes 10 seconds to stop
normally after receiving the signal, then the Container will be killed
before it can stop normally, since `terminationGracePeriodSeconds` is
less than the total time (55+10) it takes for these two things to happen.
`PreStop` hooks are not executed asynchronously from the signal to stop the Container; the hook must
complete its execution before the TERM signal can be sent. If a `PreStop` hook hangs during
execution, the Pod's phase will be `Terminating` and remain there until the Pod is killed after its
`terminationGracePeriodSeconds` expires. This grace period applies to the total time it takes for
both the `PreStop` hook to execute and for the Container to stop normally. If, for example,
`terminationGracePeriodSeconds` is 60, and the hook takes 55 seconds to complete, and the Container
takes 10 seconds to stop normally after receiving the signal, then the Container will be killed
before it can stop normally, since `terminationGracePeriodSeconds` is less than the total time
(55+10) it takes for these two things to happen.

If either a `PostStart` or `PreStop` hook fails,
it kills the Container.
Expand Down
Loading