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.

Sign up for GitHub

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

Jump to bottom

periodic merge of main onto dev-1.23 #29775

Merged
merged 120 commits into from
Sep 23, 2021
Merged

periodic merge of main onto dev-1.23 #29775

merged 120 commits into from
Sep 23, 2021

Conversation

jlbutler
Copy link
Contributor

This is a periodic merge of 'main' onto 'dev-1.23', maintaining the 1.23 integration branch.

npu21 and others added 30 commits March 28, 2021 11:05
@npu21
Fix line separation in concepts/architecture/nodes
1fb6685
Adding output for ingress-nginx namespace
b16ccb3
@anubha-v-ardhan
Added ha-control-plane.svg
b9252e5
@anubha-v-ardhan
Update highly-available-control-plane.md
7150750
@anubha-v-ardhan
Update ha-control-plane.svg
6cb9177
@anubha-v-ardhan @chrismetz09
Update content/en/docs/tasks/administer-cluster/highly-available-cont…
436d3fe 
…rol-plane.md

Co-authored-by: chrismetz09 <cymetz@gmail.com>
@anyulled
docs: volumes - spanish translation
d9e4982
@anyulled
Merge branch 'kubernetes:main' into master
e9b4cee
@anyulled
docs: volumes - spanish translation
69c70cd
@anyulled
docs: volumes - spanish translation
a1801a3 
CSI
@anyulled
docs: volumes - spanish translation
f1f3006
@anyulled
Merge branch 'kubernetes:main' into master
925b3ed
@anyulled @electrocucaracha
Update content/es/docs/concepts/storage/volumes.md
30996f3 
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
@anyulled @electrocucaracha
Update content/es/docs/concepts/storage/volumes.md
f0a52d1 
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
@anyulled @electrocucaracha
Update content/es/docs/concepts/storage/volumes.md
9a112c6 
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
@anyulled @electrocucaracha
Update content/es/docs/concepts/storage/volumes.md
e509859 
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
@anyulled @electrocucaracha
Update content/es/docs/concepts/storage/volumes.md
c1f24b1 
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
@anyulled @electrocucaracha
Update content/es/docs/concepts/storage/volumes.md
0b62eba 
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
@anyulled @electrocucaracha
Update content/es/docs/concepts/storage/volumes.md
1bb637a 
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
@anyulled @electrocucaracha
Update content/es/docs/concepts/storage/volumes.md
752aaaf 
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
@anyulled @electrocucaracha
Update content/es/docs/concepts/storage/volumes.md
faf4af3 
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
@anyulled @electrocucaracha
Update content/es/docs/concepts/storage/volumes.md
059b7c5 
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
@anyulled @electrocucaracha
Update content/es/docs/concepts/storage/volumes.md
3718b99 
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
@anyulled @electrocucaracha
Update content/es/docs/concepts/storage/volumes.md
75872b7 
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
@anyulled @electrocucaracha
Update content/es/docs/concepts/storage/volumes.md
fb1e0fb 
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
@anyulled @electrocucaracha
Update content/es/docs/concepts/storage/volumes.md
dd316d5 
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
@anyulled @electrocucaracha
Update content/es/docs/concepts/storage/volumes.md
0f97e0c 
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
@anyulled @electrocucaracha
Update content/es/docs/concepts/storage/volumes.md
563b74e 
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
@anyulled @electrocucaracha
Update content/es/docs/concepts/storage/volumes.md
c73166a 
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
@anyulled @electrocucaracha
Update content/es/docs/concepts/storage/volumes.md
9960d32 
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
@k8s-ci-robot k8s-ci-robot added this to the 1.23 milestone Sep 22, 2021
@netlify
Copy link

netlify bot commented Sep 22, 2021

👷 Deploy Preview for kubernetes-io-vnext-staging processing.

🔨 Explore the source changes: b940dce

🔍 Inspect the deploy log: https://app.netlify.com/sites/kubernetes-io-vnext-staging/deploys/614b43c3b0492d0009a438ab

@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 area/release-eng Issues or PRs related to the Release Engineering subproject language/de Issues or PRs related to German language language/en Issues or PRs related to English language labels Sep 22, 2021
@k8s-ci-robot k8s-ci-robot added language/es Issues or PRs related to Spanish language language/fr Issues or PRs related to French language language/id Issues or PRs related to Indonesian 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. sig/release Categorizes an issue or PR as relevant to SIG Release. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 22, 2021
@reylejano
Copy link
Member

The following commits had build errors and were fixed within the same PR by ensuing commits:

@reylejano
Copy link
Member

/lgtm

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

LGTM label has been added.

Git tree hash: c328db6f505b6411d2bba8817b1c51fbf7edb6d1

@tengqm
Copy link
Contributor

tengqm commented Sep 23, 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 Sep 23, 2021
@k8s-ci-robot k8s-ci-robot merged commit 5ad633b into kubernetes:dev-1.23 Sep 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bowei bowei Awaiting requested review from bowei

@cheftako cheftako Awaiting requested review from cheftako

Assignees

@reylejano reylejano

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 area/release-eng Issues or PRs related to the Release Engineering subproject cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/de Issues or PRs related to German language language/en Issues or PRs related to English language language/es Issues or PRs related to Spanish language language/fr Issues or PRs related to French language language/id Issues or PRs related to Indonesian 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. sig/release Categorizes an issue or PR as relevant to SIG Release. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
1.23
Development

Successfully merging this pull request may close these issues.