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 main into dev-1.25 branch: July 21st #35229

Merged
merged 217 commits into from
Jul 27, 2022

Conversation

sethmccombs
Copy link
Contributor

This PR syncs the main branch with the dev-1.25 branch.

MrErlison and others added 30 commits April 21, 2022 15:06
This PR proposes an update to the PR review guidelines. The proposed change is about the use of the "Request changes" or the "Approve" option when finishing a PR review. Neither of these two options should be encouraged. We may want to encourage reviewers to always use "Comment", because:

- "Request changes" status is sticky and unnecessary. Placing a "/hold" should be okay because we do respect opinions from all reviewers/approvers.
  The "Request changes" status can only be discarded by people with privileges.
  We see quite a few cases where the reviewer left a "Request changes" mark and forgot to revisit a PR.
  Such a sticky status is not friendly to contributors or peer reviewers.

- The "Approve" option is confusing. It is not considered by the prow as an approval IIUC. The PR has to be approved again even if it has been "approved" this way.
I added access to the statement explaining cluster role  permissions in this document to make it clearer.
This PR fix the wrong guide according to the commit bellow:

[apiserver: support egress selection name 'controlplane' and deprecate 'master'](kubernetes/kubernetes@a0aebf9)
…urces/validating-webhook-configuration-v1.md

[zh-cn]Update content/zh-cn/docs/reference/kubernetes-api/extend-resources/validating-webhook-configuration-v1.md

[zh-cn]Update content/zh-cn/docs/reference/kubernetes-api/extend-resources/validating-webhook-configuration-v1.md

[zh-cn]Update content/zh-cn/docs/reference/kubernetes-api/extend-resources/validating-webhook-configuration-v1.md

[zh-cn]Update content/zh-cn/docs/reference/kubernetes-api/extend-resources/validating-webhook-configuration-v1.md

[zh-cn]Update content/zh-cn/docs/reference/kubernetes-api/extend-resources/validating-webhook-configuration-v1.md

[zh-cn]Update content/zh-cn/docs/reference/kubernetes-api/extend-resources/validating-webhook-configuration-v1.md
There are deprecated kubelet flags related to garbage collection. These flags were listed in the `kubelet-garbage-collection.md` page, which was removed by b1573ad. Linking to the `kubelet` reference is not a good solution because users may still get confused what are the specific flags related to this behavior.

This PR restores the table with the flags updated according to 1.24 version of `kubelet --help`.
All resource requests parse units the same way. Ephemeral storage previously had an upper case `K` as a valid unit but the kubernetes server can not parse this value.

Similar to memory, add a statement regarding that a lowercase `m` will be accepted by the kubernetes server, but is probably an incorrect request.
…urces/pod-disruption-budget-v1.md

[zh-cn]Update content/zh-cn/docs/reference/kubernetes-api/policy-resources/pod-disruption-budget-v1.md

[zh-cn]Update content/zh-cn/docs/reference/kubernetes-api/policy-resources/pod-disruption-budget-v1.md

[zh-cn]Update content/zh-cn/docs/reference/kubernetes-api/policy-resources/pod-disruption-budget-v1.md

[zh-cn]Update content/zh-cn/docs/reference/kubernetes-api/policy-resources/pod-disruption-budget-v1.md
…with-affinity-anti-affinity.yaml

[zh-cn]Update pod-with-affinity-anti-affinity.yaml
[zh-cn]Fixed a word in explore-intro.html
Signed-off-by: utkarsh-singh1 <[email protected]>
…webhook-configuration-v1

[zh-cn] Translate ValidatingWebhookConfiguration-v1
[zh-cn] resync /partners/_index.html
…-signed-images

Updated the expired link for Configuration option
…te_KubeletCredentialProvider

Fix KubeletCredentialProvider feature state
Fix wrong guide for egress selection.
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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 language/es Issues or PRs related to Spanish language labels Jul 21, 2022
@k8s-ci-robot k8s-ci-robot requested a review from bene2k1 July 21, 2022 20:53
@k8s-ci-robot k8s-ci-robot added the language/fr Issues or PRs related to French language label Jul 21, 2022
@k8s-ci-robot k8s-ci-robot requested a review from cheftako July 21, 2022 20:53
@k8s-ci-robot k8s-ci-robot added language/id Issues or PRs related to Indonesian language language/it Issues or PRs related to Italian language language/ja Issues or PRs related to Japanese language language/ko Issues or PRs related to Korean language language/pt Issues or PRs related to Portuguese language language/vi Issues or PRs related to Vietnamese 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. labels Jul 21, 2022
@Sea-n
Copy link
Member

Sea-n commented Jul 22, 2022

/retitle Merge main into dev-1.25 branch: July 21st

And I think the PR description is not clear. Seems like merge dev-1.25 into main branch.

This PR syncs the main branch with the dev-1.25 branch.

Maybe this would be better

This PR syncs the dev-1.25 branch (with the main branch).

@k8s-ci-robot k8s-ci-robot changed the title Merged main dev 1.25: July 21st Merge main into dev-1.25 branch: July 21st Jul 22, 2022
@sethmccombs
Copy link
Contributor Author

sethmccombs commented Jul 22, 2022

/retitle Merge main into dev-1.25 branch: July 21st

And I think the PR description is not clear. Seems like merge dev-1.25 into main branch.

This PR syncs the main branch with the dev-1.25 branch.

Maybe this would be better

This PR syncs the dev-1.25 branch (with the main branch).

Sounds good. I just copied over the description from a previous branch sync PR

@reylejano
Copy link
Member

I took a look at 5ebea62 for an unverified commit signature. It was part of merged PR #35003 to update the list of release managers. The author of the PR is a SIG Release Tech Lead.
/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 Jul 25, 2022
@cici37
Copy link
Contributor

cici37 commented Jul 27, 2022

HI just curious if we plan to merge main to dev-1.25, why don't we do dev-1.25...main ? Just to avoid confusion on if any personal commit added :)

@cici37
Copy link
Contributor

cici37 commented Jul 27, 2022

/lgtm
I guess it is for version control on time and potential conflicts? The PR looks good. Thanks

HI just curious if we plan to merge main to dev-1.25, why don't we do dev-1.25...main ? Just to avoid confusion on if any personal commit added :)

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

LGTM label has been added.

Git tree hash: 78585554665b8c47d47e36e82fa797799745d678

@k8s-ci-robot k8s-ci-robot merged commit 552925f into kubernetes:dev-1.25 Jul 27, 2022
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 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/it Issues or PRs related to Italian language language/ja Issues or PRs related to Japanese language language/ko Issues or PRs related to Korean language language/pt Issues or PRs related to Portuguese language language/vi Issues or PRs related to Vietnamese 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
Development

Successfully merging this pull request may close these issues.