Merge master into dev-1.20 to keep in sync 12-03-20 #25378

kcmartin · 2020-12-03T18:49:50Z

Merge master into dev-1.20 to keep in sync 12-03-20

…e changes.

- (try to) imply that pod templates are part of an owning resource, not part of the pod itself - explain that the owning resource must replace Pods if the pod template changes

Co-authored-by: Karen Bradshaw <kbhawkey@gmail.com>

implementing review comments

implemented review comments

AWS ALB Ingress Controller is now renamed to AWS Load Balancer Controller

implemented feedback

updated review comments

Coil is a new open-source CNI plugin for Kubernetes. Resources: - https://github.com/cybozu-go/coil - https://blog.kintone.io/entry/coilv2

In content/{en, ja, ko, zh}/docs/setup/production-environment/windows/user-guide-windows-containers.md: https://gist.github.com/{wagnerandrade => 19WAS85}/5424431

Co-authored-by: Tim Bannister <tim@scalefactory.com>

Switch New York Times case study to use youtube shortcode

AWS ALB Ingress Controller renamed to AWS Load Balancer Controller

…emplate_updates Improve explanation about pod template updates

commands to create job and cronjob

update broken link

Add reference to AKS as a managed Kubernetes service

Add reference to AKS

…-1.20

annajung · 2020-12-03T20:27:23Z

commits with build errors:

ad8b32f 72fb7e4 e0a2a5f

Nothing stands out from the logs, similar to the errors we have seen in the past.

/lgtm

k8s-ci-robot · 2020-12-03T20:27:39Z

LGTM label has been added.

Git tree hash: 7028565e8b150bf0590fd134ca50cb4668f4f727

kbhawkey · 2020-12-03T20:55:29Z

I see this error, perhaps it was fixed in a follow-up PR:

$ git submodule update --init --recursive --depth 1 && make deploy-preview
10:35:31 PM: hugo --enableGitInfo --buildFuture -b https://deploy-preview-25244--kubernetes-io-master-staging.netlify.app
10:37:02 PM: Building sites … ERROR 2020/11/27 03:35:58 [zh] "docs/reference/glossary/controller.md": "kube-cluster" is not a valid glossary term_id, see ./docs/reference/glossary/* for a full list
ERROR 2020/11/27 03:36:02 [zh] "docs/reference/glossary/dynamic-volume-provisioning.md": "储存类别（storage-class）" is not a valid glossary term_id, see ./docs/reference/glossary/* for a full list
Total in 90564 ms

annajung · 2020-12-03T21:24:00Z

Thanks for double-checking @kbhawkey !
Do you know what the process is when there is a build failure like this?

kbhawkey · 2020-12-03T21:38:28Z

I am guessing this error was fixed in a later PR? The site builds.

annajung · 2020-12-03T21:53:20Z

ahh okay, so I think this happened because merge had multiple commits (https://github.com/kubernetes/website/pull/25244/commits)

So it was fixed by the last change

kbhawkey · 2020-12-03T22:14:14Z

/lgtm

kbhawkey · 2020-12-03T22:15:27Z

Thanks @kcmartin !
/approve

k8s-ci-robot · 2020-12-03T22:16:00Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kbhawkey

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [kbhawkey]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

devries and others added 30 commits August 13, 2020 08:59

Replace master/slave with primary/secondary where possible

044d11d

Change secondary to replica and use primary as an adjective consistently

4bb76cd

Incorporate suggested language change from Tim Bannister with a coupl…

b7f8f82

…e changes.

Improve explanation about pod template updates

225be5b

- (try to) imply that pod templates are part of an owning resource, not part of the pod itself - explain that the owning resource must replace Pods if the pod template changes

Update i18n strings and ordering the entries

5819f16

Tweak docs about Kubernetes API versions

4e0b662

Co-authored-by: Karen Bradshaw <kbhawkey@gmail.com>

commands to create job and cronjob

18eb0bf

implementing review comments

177fb0d

implementing review comments

implemented review comments

bc2b4f2

implemented review comments

AWS ALB Ingress Controller renamed to AWS Load Balancer Controller

1d08f1f

AWS ALB Ingress Controller is now renamed to AWS Load Balancer Controller

update broken link

5f5eca7

implemented feedback

18e4eaf

implemented feedback

updated review comments

ba4b043

updated review comments

[zh] Resync docs/concepts/storage/volumes.md

c82d823

implemented review comments

4ed2587

Improve Taints and Tolerations example

937ddce

Switch New York Times case study to use youtube shortcode

4ba449d

Replace the diagram on authentication page with the one by mermaid.

b5c0e5e

Add Coil CNI to networking.md

499435d

Coil is a new open-source CNI plugin for Kubernetes. Resources: - https://github.com/cybozu-go/coil - https://blog.kintone.io/entry/coilv2

Fix broken link

d38bbe2

In content/{en, ja, ko, zh}/docs/setup/production-environment/windows/user-guide-windows-containers.md: https://gist.github.com/{wagnerandrade => 19WAS85}/5424431

Update with correct AWS product name

30bf45e

Co-authored-by: Tim Bannister <tim@scalefactory.com>

[zh] Sync changes from English site (5)

e97677e

update the markdown file in the glossary directory.

7260dbf

Updates links to Dex

f5132af

Merge pull request kubernetes#25138 from habibrosyad/kubernetesgh-25124

a712d2b

Switch New York Times case study to use youtube shortcode

Merge pull request kubernetes#24777 from chlunde/patch-1

4307125

AWS ALB Ingress Controller renamed to AWS Load Balancer Controller

Merge pull request kubernetes#24525 from sftim/20201012_explain_pod_t…

cdd6e9a

…emplate_updates Improve explanation about pod template updates

video block sync

e1bc6ac

Merge pull request kubernetes#24701 from ramnar/patch-1

a27c157

commands to create job and cronjob

Merge pull request kubernetes#24794 from lovebaby979/README-pl

5ddf805

update broken link

k8s-ci-robot added language/en Issues or PRs related to English language language/fr Issues or PRs related to French language language/ja Issues or PRs related to Japanese language language/ko Issues or PRs related to Korean language labels Dec 3, 2020

k8s-ci-robot requested review from bene2k1 and brancz December 3, 2020 18:50

k8s-ci-robot added language/pl Issues or PRs related to Polish language language/ru Issues or PRs related to Russian language language/zh Issues or PRs related to Chinese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Dec 3, 2020

craiglpeters and others added 3 commits December 3, 2020 11:15

Add reference to AKS

5bd49df

Add reference to AKS as a managed Kubernetes service

Merge pull request kubernetes#25380 from craiglpeters/patch-5

0ed1c2d

Add reference to AKS

Merge remote-tracking branch 'upstream/master' into merged-master-dev…

86d9492

…-1.20

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Dec 3, 2020

k8s-ci-robot assigned annajung Dec 3, 2020

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 3, 2020

k8s-ci-robot assigned kbhawkey Dec 3, 2020

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 3, 2020

k8s-ci-robot merged commit 251092f into kubernetes:dev-1.20 Dec 3, 2020

kcmartin deleted the merged-master-dev-1.20 branch December 3, 2020 22:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge master into dev-1.20 to keep in sync 12-03-20 #25378

Merge master into dev-1.20 to keep in sync 12-03-20 #25378

kcmartin commented Dec 3, 2020

annajung commented Dec 3, 2020

k8s-ci-robot commented Dec 3, 2020

kbhawkey commented Dec 3, 2020 •

edited

annajung commented Dec 3, 2020

kbhawkey commented Dec 3, 2020

annajung commented Dec 3, 2020

kbhawkey commented Dec 3, 2020

kbhawkey commented Dec 3, 2020

k8s-ci-robot commented Dec 3, 2020

Merge master into dev-1.20 to keep in sync 12-03-20 #25378

Merge master into dev-1.20 to keep in sync 12-03-20 #25378

Conversation

kcmartin commented Dec 3, 2020

annajung commented Dec 3, 2020

k8s-ci-robot commented Dec 3, 2020

kbhawkey commented Dec 3, 2020 • edited

annajung commented Dec 3, 2020

kbhawkey commented Dec 3, 2020

annajung commented Dec 3, 2020

kbhawkey commented Dec 3, 2020

kbhawkey commented Dec 3, 2020

k8s-ci-robot commented Dec 3, 2020

kbhawkey commented Dec 3, 2020 •

edited