Skip to content

Merged main into dev 1.24 #32118

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
Merged
merged 182 commits into from
Mar 16, 2022
Merged

Merged main into dev 1.24 #32118

merged 182 commits into from
Mar 16, 2022

Conversation

nate-double-u
Copy link
Contributor

Week 9 update to bring main into dev-1.24 branch.

shannonxtreme and others added 30 commits September 10, 2021 20:51
@shannonxtreme
Add information to API evictions
c2f5549
@shannonxtreme
Add information to API evictions
d634580
@bene2k1
[de] Participating in SIG Docs
c6f301b
@bene2k1
typo
4f1ccf1
@bene2k1
fixed broken links + typos
74c53d6
@bene2k1
Update content/de/docs/contribute/participate/_index.md
4008617 
Co-authored-by: Tim Bannister <[email protected]>
@bene2k1
Update content/de/docs/contribute/participate/_index.md
bbc216b 
Co-authored-by: Tim Bannister <[email protected]>
@bene2k1
add unicode characters
249248e
@bene2k1
add unicode characters
62e8810
@bene2k1
fix typo
4dc1493
@bene2k1
fix typos and wording review
2261af1
@bene2k1
typo
e97b170
@jarmee-asol
Fix typo in hello-minikube.md
734aa6b
@deining
Minor improvements
7a7fa15
@tengqm
[zh] Translate kubeadm config ref v1beta2
e05a28c
@KobayashiD27
translate concepts/storage/volume.md into japanese
3d96a08
@ctalledo
Add Sysbox as an option to run kubernetes inside unprivileged contain…
021f8be 
…ers or pods.

Sysbox is an open-source container runtime (similar to "runc") that supports
running VM-workloads such as Docker and Kubernetes inside unprivileged
containers or pods.

Sysbox containers always use the Linux user-namespace for isolation, plus
specially crafted proc and sys filesystems, some syscall interception,
filesystem ID-mapping, and more.

It's possible to run Kubernetes, K3s, K0s, inside containers or pods deployed
with Sysbox. This commit aims to make the Kubernetes community aware of this
option.

Signed-off-by: Cesar Talledo <[email protected]>
@mtardy
Add documentation on pod-security.kubernetes.io annotations
167ddd3
@KobayashiD27 @nasa9084
Update content/ja/docs/concepts/storage/volumes.md
e756335 
Co-authored-by: nasa9084 <[email protected]>
@KobayashiD27 @nasa9084
Update content/ja/docs/concepts/storage/volumes.md
369d512 
Co-authored-by: nasa9084 <[email protected]>
@KobayashiD27
fix word mistakes
070853a
@mtardy
Add disclaimers before reorganizing this reference page between API g…
3cc1b1b 
…roups
@mtardy
Remove the Used on information and replace caution tag with note
e00fe1d
@tengqm
Fix links and markdown format for some pages
459a3f9
@wongma7
Add that CSIMigration* fallback does not work for provision operations
d5c500b
@tengqm
[zh] Translate kube-scheduler config API v1beta2
3d1ca8c
@championshuttler
[de] Fix broken links due to using githubbranch param
4efe336
@KoditkarVedant
Update hyperlinks to point to main branch
88fae78
@Arhell
[id] update schedule
70827d5
@voelzmo
Update proposal link to point to archive
9823ecd 
Original link says
```
Design proposals have been archived.

To view the last version of this document, see the Design Proposals Archive Repo.

Please remove after 2022-04-01 or the release of Kubernetes 1.24, whichever comes first.
```
@k8s-ci-robot k8s-ci-robot added sig/docs Categorizes an issue or PR as relevant to SIG Docs. sig/release Categorizes an issue or PR as relevant to SIG Release. labels Mar 8, 2022
@nate-double-u
Copy link
Contributor Author

Error relates to the EasyCLA — Missing CLA Authorization.

/cc @JamesLaverack, FYI
/cc @jlbutler @sftim @reylejano

@reylejano
Copy link
Member

/easycla

@sftim sftim added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Mar 8, 2022
@sftim
Copy link
Contributor

sftim commented Mar 8, 2022

I've manually marked this as having CLA authorization with labelling, because the CLA bot we used at the time of that commit marked things as OK. That won't be enough though.

If @JamesLaverack can re-sign the CLA, great; if not, we can deal with this exception manually.

@sftim
Copy link
Contributor

sftim commented Mar 8, 2022

Provided the changes are OK, it's fine to proceed with reviews.

@nate-double-u
Copy link
Contributor Author

/cc @marosset FYI 🙂

@nate-double-u
Copy link
Contributor Author

Hi @jarmee, Could you please take a look at the easy CLA message above?

❌ login: jarmee / name: Jari Möllenbernd (734aa6b). This user is authorized, but they must confirm their affiliation with their company. Start the authorization process by clicking here, click "Corporate",select the appropriate company from the list, then confirm your affiliation on the page that appears. For further assistance with EasyCLA, please submit a support request ticket.

@reylejano
Copy link
Member

easyCLA error
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: reylejano

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 Mar 15, 2022
@jlbutler
Copy link
Contributor

this needs an lgtm to merge, let's see if mine works...

/lgtm

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

LGTM label has been added.

Git tree hash: b85b5896570feaacde78a19a1e62605fa506533c

@marosset
Copy link
Contributor

/easycla

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. and removed cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 15, 2022
@jlbutler
Copy link
Contributor

jlbutler commented Mar 15, 2022 •
edited
Loading

well apparently the CLA is still throwing issues (i don't think the 1.24 docs lead is missing a CLA), but it's now blocking merges. not sure how to unstick this.

@reylejano @JamesLaverack any idea?

@nate-double-u
Copy link
Contributor Author

@mrbobbytables @dims could you take a look?

@marosset
Copy link
Contributor

From a mail to [email protected] @nate-double-u should file a ticket at https://jira.linuxfoundation.org/servicedesk/customer/portal/4 and post in kubernetes/org#3068

@nate-double-u nate-double-u mentioned this pull request Mar 15, 2022
Closed
@sftim sftim merged commit c0aed19 into kubernetes:dev-1.24 Mar 16, 2022
@sftim
Copy link
Contributor

sftim commented Mar 16, 2022

I merged this manually. We may well still need to look into that CLA trouble, as it will crop up again when we want to merge dev-1.24 into main.

@nate-double-u nate-double-u deleted the merged-main-dev-1.24 branch March 16, 2022 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bene2k1 bene2k1 Awaiting requested review from bene2k1

@bgrant0607 bgrant0607 Awaiting requested review from bgrant0607

@jlbutler jlbutler Awaiting requested review from jlbutler

@reylejano reylejano Awaiting requested review from reylejano

@sftim sftim Awaiting requested review from sftim

Assignees

@jlbutler jlbutler

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: no Indicates the PR's author has not 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/id Issues or PRs related to Indonesian language language/ja Issues or PRs related to Japanese 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.24
Development

Successfully merging this pull request may close these issues.