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 branch into dev-1.25 #35582

Merged
merged 474 commits into from
Aug 1, 2022

Conversation

krol3
Copy link
Contributor

@krol3 krol3 commented Jul 30, 2022

Merge main into dev-1.25 to keep in sync - SIG-Release 1.25 Docs team 30/07/22
/cc @kcmartin @cathchu @didicodes @sethmccombs

yanrongshi and others added 30 commits July 24, 2022 19:19
[zh-cn] resync /concepts/scheduling-eviction/_index.md
…-link-ja

[ja] Fix links in release versioning
[zh-cn] sync /blog/_posts/2022-07-13-gateway-api-in-beta.md
Signed-off-by: Mr. Erlison <sisal.cordame_0a@icloud.com>
Signed-off-by: Mr. Erlison <sisal.cordame_0a@icloud.com>
[zh-cn]Update content/zh-cn/docs/concepts/workloads/pods/_index.md
[zh-cn]Update content/zh-cn/docs/concepts/scheduling-eviction/kube-scheduler.md
…ent-/docs/concepts/scheduling-eviction/_index.md

[zh-cn]Update scheduling-eviction/_index.md
…ink-on-2020-09-30-writing-crl-scheduler/index.md

[zh-cn]fix a old links on 2020-09-30-writing-crl-scheduler/index.md
…ure-gates.md

[zh-cn]Update feature-gates.md
[zh-cn]Update content/zh-cn/docs/concepts/services-networking/service-traffic-policy.md
…al-kubectl-configs-bash-mac

[zh-cn]sync optional-kubectl-configs-bash-mac.md
[zh-cn]Update content/zh-cn/docs/tasks/run-application/delete-stateful-set.md
…ng-secret-using-kustomize

[zh-cn]sync managing-secret-using-kustomize.md
@netlify
Copy link

netlify bot commented Jul 30, 2022

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

Name Link
🔨 Latest commit d4fb248
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-io-vnext-staging/deploys/62e5ac79b3858c0008e08b2c

@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/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 cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/ja Issues or PRs related to Japanese language language/ko Issues or PRs related to Korean language language/pl Issues or PRs related to Polish language language/pt Issues or PRs related to Portuguese language language/zh Issues or PRs related to Chinese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Jul 30, 2022
@Sea-n
Copy link
Member

Sea-n commented Jul 31, 2022

Hey, please avoid using dd/mm/yy, mm/dd/yy, yy/mm/dd or something like that. It's confusing in some cases such as 06/08/22.

I think it's better to use RFC 3339 (or ISO 8601) format like 2022-07-30.
And it's git / GitHub, we already have timestamp for every operation, maybe it's not necessary to include time in the PR title.

@krol3 krol3 changed the title Merged main into dev 1.25 - 30/07/22 Merged main into dev 1.25 - 30-07-22 Aug 1, 2022
@reylejano
Copy link
Member

Clean sync 👍
/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 Aug 1, 2022
@Sea-n
Copy link
Member

Sea-n commented Aug 1, 2022

There is no dd-mm-yy format. 😅

/retitle Merge main branch into dev-1.25

@k8s-ci-robot k8s-ci-robot changed the title Merged main into dev 1.25 - 30-07-22 Merge main branch into dev-1.25 Aug 1, 2022
@sftim
Copy link
Contributor

sftim commented Aug 1, 2022

/lgtm

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

LGTM label has been added.

Git tree hash: 765f59d489690e9508efd4839300b3bf1c590574

@k8s-ci-robot k8s-ci-robot merged commit acdef19 into kubernetes:dev-1.25 Aug 1, 2022
@krol3 krol3 deleted the merged-main-dev-1.25 branch August 4, 2022 18:31
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/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/ja Issues or PRs related to Japanese language language/ko Issues or PRs related to Korean language language/pl Issues or PRs related to Polish language language/pt Issues or PRs related to Portuguese 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.

None yet