Skip to content

merge main onto dev-1.23 #29657

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

Merged
merged 491 commits into from
Sep 10, 2021
Merged

merge main onto dev-1.23 #29657

merged 491 commits into from
Sep 10, 2021

Conversation

jlbutler
Copy link
Contributor

@jlbutler jlbutler commented Sep 9, 2021

Merge 'main' onto dev-1.23 integration branch.

tengqm and others added 30 commits August 15, 2021 19:57
Fix some errors in the feature-gates page
…on-versioning

[zh] update custom-resource-definition-versioning.md
[fr] Deleted reference to removed file
French translation of workloads page
Hard-code the name of the target repo's default branch instead of using the githubbranch parameter value
[zh] Fix list all uniq container images
Update Polish localization of the home page
Synchronize Polish localization for ver 1.22, part 1
Synchronize Polish localization for ver 1.22, part 2
[zh] Concept files to sync for 1.22 - (8) Service
[zh]sync tutorials files for 1.22
[zh] Concept files to sync for 1.22 - (9) Scheduling
[zh] Delete logging-stackdriver.md
@k8s-ci-robot k8s-ci-robot added 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/ru Issues or PRs related to Russian language language/vi Issues or PRs related to Vietnamese language labels Sep 9, 2021
@k8s-ci-robot k8s-ci-robot added 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 9, 2021
@jlbutler
Copy link
Contributor Author

jlbutler commented Sep 9, 2021

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 9, 2021
@jlbutler jlbutler changed the title merged main onto dev-1.23 merge main onto dev-1.23 Sep 9, 2021
@reylejano
Copy link
Member

Build error with commit 9d5769e, fixed in the same PR #29626 with commit 6fe1e16

@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 9, 2021
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: b845154fc5bf540afdfe6d95cbcdd68da6febed4

@jlbutler
Copy link
Contributor Author

jlbutler commented Sep 9, 2021

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 9, 2021
@PI-Victor
Copy link
Member

unfortunately i lost my super powers and can't approve anymore, but LGTM!

@sftim
Copy link
Contributor

sftim commented Sep 10, 2021

/approve

@sftim
Copy link
Contributor

sftim commented Sep 10, 2021

Ah, that's a tiny bit annoying.
/committee steering

for the announcement changes.

@k8s-ci-robot k8s-ci-robot added the committee/steering Denotes an issue or PR intended to be handled by the steering committee. label Sep 10, 2021
@mrbobbytables
Copy link
Member

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mrbobbytables, sftim

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 10, 2021
@k8s-ci-robot k8s-ci-robot merged commit 5fcbda2 into kubernetes:dev-1.23 Sep 10, 2021
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. committee/steering Denotes an issue or PR intended to be handled by the steering committee. 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/hi Issues or PRs related to Hindi language language/id Issues or PRs related to Indonesian 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/ru Issues or PRs related to Russian 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.