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

Merge master into dev-1.20 to keep in sync #24290

Merged
merged 852 commits into from
Oct 5, 2020
Merged

Merge master into dev-1.20 to keep in sync #24290

merged 852 commits into from
Oct 5, 2020

Conversation

kcmartin
Copy link
Contributor

@kcmartin kcmartin commented Oct 1, 2020

Merge master into dev-1.20 to keep in sync - SIG-Release 1.20 Docs team 09/30/20

baiyutang and others added 30 commits September 18, 2020 17:38
@baiyutang
Update configure-upgrade-etcd.md
924f375
@howieyuen
add missing links in/zh/docs/home/contribute
1fc81d3
@k8s-ci-robot
Merge pull request kubernetes#23981 from howieyuen/contribute
89126c4 
[zh] add missing links in/zh/docs/home/contribute
@supirman
[id] Fix image path for Deploy App tutorial
273f656 
/language id
@baiyutang
Update configure-upgrade-etcd.md
f88b7e6
@howieyuen
translate /zh/docs/tasks/configmap-secret/managing-secret-using-kubec…
7529aca 
…tl.md
@howieyuen
fix code block cannot be rendered in title
dfda08a
@tanjunchen
add tanjunchen to sig-docs-zh team
cbc0603
@rgowrishankar
Add reference to default-not-ready-toleration-seconds and default-unr…
147668a 
…eachable-toleration-seconds k8s-apiserver input parameters in the subsection describing the DefaultTolerationSeconds admission controller
@k8s-ci-robot
Merge pull request kubernetes#23963 from Arhell/fix-toggle
3f8a10f 
fix toggle button
@kbhawkey
fix copy clipboard
245f989
@fmuyassarov
Fix 404 issues
55d2702
@tengqm
Remove duplicated content in concepts and reference
3cc1371 
We currently have quite some contents duplicated between the concepts
and the reference section, which is not good. This PR is an effort to
remove the duplicated content from the two pages while providing links
for readers to check the reference easily.
@k8s-ci-robot
Merge pull request kubernetes#23979 from baiyutang/patch-7
51c6c03 
Update configure-upgrade-etcd.md
@k8s-ci-robot
Merge pull request kubernetes#23986 from howieyuen/fix-format
820f470 
[en] fix code block rendering mistake
@shuuji3 @bells17
Apply suggestions from code review
c02a3cf 
Co-authored-by: bells17 <bells171@gmail.com>
@shuuji3
Replace "ephemeral" with "エフェメラル".
1c7cf96
@k8s-ci-robot
Merge pull request kubernetes#23754 from sftim/20200908_link_to_well_…
d4d1c04 
…known_labels

Link to well-known labels rather than repeating the list
@k8s-ci-robot
Merge pull request kubernetes#23983 from howieyuen/configmap-secret
5ecdaee 
translate /zh/docs/tasks/configmap-secret/managing-secret-using-kubectl.md
@tengqm
[zh] Rework parallel processing expansion
59cac83 
The English content was COMPLETELY REWRITTEN for DAMN REASONS.
@didier-durand
namespaces FR : fixing typos and improving a few points
43893ac
@negz
Clarify that bind verb does not require resourceNames
f6496b0 
This may be intuitive for most, but the existing phrasing read to me as
if `bind` were a special-case verb that _required_ me to explicitly state
which Roles or ClusterRoles it should apply to.

> You can only create/update a role binding if you […] or if you have
> been authorized to perform the bind verb on the referenced role.

> Grant them permissions needed to bind a particular role […]
> explicitly, by giving them permission to perform the bind verb on the
> particular Role (or ClusterRole).
@Tej-Singh-Rana
Contex to Context
70eba58
@k8s-ci-robot
Merge pull request kubernetes#24005 from Tej-Singh-Rana/k8s-tej
c85c3ff 
Contex to Context
@howieyuen
fix redirect to en link in chinese page
3bc1478
@k8s-ci-robot
Merge pull request kubernetes#23993 from fmuyassarov/fix-404-feruz
7a5fc71 
Fix 404 issues
@k8s-ci-robot
Merge pull request kubernetes#24003 from didier-durand/namespaces_FR
51bf421 
namespaces FR : fixing typos and improving a few points
@sushilkm
Fixed typo
cf14321 
Fixed typo s/kustomizae/kustomize
@k8s-ci-robot
Merge pull request kubernetes#24010 from sushilkm/patch-1
daf6210 
Fixed typo s/kustomizae/kustomize
@negz
Move bind verb resourceNames hint inline of example
2f9b5e1
@k8s-ci-robot k8s-ci-robot added 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/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/uk Issues or PRs related to Ukrainian 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. labels Oct 1, 2020
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 1, 2020
@annajung
Copy link
Contributor

annajung commented Oct 1, 2020

Hey @jimangel @savitharaghunathan, wondering if we can get your feedback on how to resolve invalid commit message issue?

@jimangel
Copy link
Member

jimangel commented Oct 1, 2020

I believe we ran into this last cycle and chose to ignore it. k8s-ci-robot doesn't like # or @ references in commit messages. This is to prevent triggering of mentions everytime it performs operations.

However, much like this PR, a merge PR will inevitably contain a unique PR number in the commit message. This is what we are seeing from localization merge PRs.

I will double check tomorrow, but we most likely can ignore.

@annajung
Copy link
Contributor

annajung commented Oct 1, 2020

Thanks @jimangel ! I do remember now that we ran into something similar in the last release. Is there an issue already created for this from last time? If not, I can follow up and create one.

Or if the behavior is there on purpose, maybe we can enforce not adding @ or # in the comments and in the title of the PR somehow?

Taking this PR(#23988) as an example. It looks like the invalid commit message was fixed, so the commit itself doesn't have # or @, but the PR title does. Could it be related to PR titles as well?

@savitharaghunathan
Copy link
Member

Here's the link to PR kubernetes/test-infra#17893, that was created as a follow up in the test-infra repo.

@annajung
Copy link
Contributor

annajung commented Oct 1, 2020

Thank you @savitharaghunathan!

@annajung annajung mentioned this pull request Oct 1, 2020
Closed
@jimangel jimangel removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Oct 5, 2020
@jimangel
Copy link
Member

jimangel commented Oct 5, 2020

Following precedent from #21604 I manually removed the invalid commit label. I would like to get another /lgtm from someone before approving. LGTM

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jimangel

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 Oct 5, 2020
savitharaghunathan
savitharaghunathan reviewed Oct 5, 2020
View reviewed changes
Copy link
Member

@savitharaghunathan savitharaghunathan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

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

LGTM label has been added.

Git tree hash: 16f3cbd3ca0e7811bf6cb9c78d2288f90f827a35

@k8s-ci-robot k8s-ci-robot merged commit 5e7cb3f into kubernetes:dev-1.20 Oct 5, 2020
@annajung annajung mentioned this pull request Oct 7, 2020
Merged
@kcmartin kcmartin deleted the merged-master-dev-1.20 branch October 28, 2020 21:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@savitharaghunathan savitharaghunathan savitharaghunathan left review comments

@Random-Liu Random-Liu Awaiting requested review from Random-Liu

@rekcah78 rekcah78 Awaiting requested review from rekcah78

Assignees

@savitharaghunathan savitharaghunathan

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/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/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/uk Issues or PRs related to Ukrainian 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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.