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

Merge master into dev 1.21 - 2/19/21 #26630

Merged
merged 87 commits into from
Feb 20, 2021
Merged

Merge master into dev 1.21 - 2/19/21 #26630

merged 87 commits into from
Feb 20, 2021

Conversation

reylejano
Copy link
Member

Merge master into dev-1.21 to keep in sync - SIG-Release 1.21 Docs team 2/19/21

/cc @mvortizr @tengqm @PI-Victor @ChandaniM123

georgettica and others added 30 commits January 12, 2021 01:26
as the CKA requires taking these code snippets and using them quickly, spaces can be an issue

add two spaces to begin of line to make pod spec copying even faster (if this is the case)
…ontroller.md

* Update architecture\controller.md and architecture\node.md

Signed-off-by: ydFu <[email protected]>
update based on English version of statefulset.md

1. added a block inside #stable-network-id
2. sync tables and blocks
3. added a sentence in #parallel-pod-management
[zh] correct name in test.md
One more ingress Controller to add to the list of 3rd party Ingress providers.
fixed some typos and grammatical mistakes
k8s-ci-robot and others added 4 commits February 18, 2021 22:52
[zh] Resync concepts pages for services-networking\dual-stack.md
* Translate Explore You App in Portuguese

* Update Explore Your App link in Learn Kubernetes Basics _index.html

* Update link to Explore Interactive page translation in Portuguese

* Fix typo and change the translation of the word *worker*.

Signed-off-by: Jailton Lopes <[email protected]>

* Fix typo

Signed-off-by: Jailton Lopes <[email protected]>
@k8s-ci-robot k8s-ci-robot added this to the 1.21 milestone Feb 19, 2021
@k8sio-netlify-preview-bot
Copy link
Collaborator

Deploy preview for kubernetes-io-vnext-staging processing.

Building with commit 736139e

https://app.netlify.com/sites/kubernetes-io-vnext-staging/deploys/60301edcd4239700070696ca

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. area/blog Issues or PRs related to the Kubernetes Blog subproject language/en Issues or PRs related to English language language/es Issues or PRs related to Spanish language language/ko Issues or PRs related to Korean language language/pt Issues or PRs related to Portuguese 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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 19, 2021
@reylejano
Copy link
Member Author

reylejano commented Feb 19, 2021

Build errors:

@annajung
Copy link
Contributor

Thanks Rey!

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 19, 2021
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 806643b086ced63f21ba80dab4f1571a9cad1bdf

@tengqm
Copy link
Contributor

tengqm commented Feb 20, 2021

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tengqm

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:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 20, 2021
@k8s-ci-robot k8s-ci-robot merged commit 0f45519 into kubernetes:dev-1.21 Feb 20, 2021
@reylejano reylejano deleted the merged-master-dev-1.21 branch February 20, 2021 00:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/blog Issues or PRs related to the Kubernetes Blog subproject cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/en Issues or PRs related to English language language/es Issues or PRs related to Spanish language language/ko Issues or PRs related to Korean language language/pt Issues or PRs related to Portuguese language language/ru Issues or PRs related to Russian language language/zh Issues or PRs related to Chinese language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.