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

ZH-trans: merge release-1.16-temporary to release-1.17 #18230

Merged
merged 416 commits into from Dec 25, 2019
Merged

ZH-trans: merge release-1.16-temporary to release-1.17 #18230

merged 416 commits into from Dec 25, 2019

Conversation

xichengliudui
Copy link
Contributor

zhangx501 and others added 30 commits October 15, 2019 02:51
@zhangx501 @k8s-ci-robot
Update http-proxy-access-api.md (kubernetes#16932)
ee55674
@zhangx501 @k8s-ci-robot
Update coredns.md (kubernetes#16930)
306c9ae
@pandaamanda @k8s-ci-robot
zh-trans:/docs/docs/concepts/workloads/pods/ephemeral-containers.md (k…
430c7b3 
…ubernetes#16948)
@wangyx1992 @k8s-ci-robot
update zh-trans of define-environment-variable-container.md (kubernet…
51b026c 
…es#16999)

Signed-off-by: Yixiang2019 <wang.yixiang@zte.com.cn>
@hwdef @k8s-ci-robot
update chinese docs (kubernetes#16985)
c91cccb
@ping035627 @k8s-ci-robot
Fix ordered list (kubernetes#16988)
074b600 
Signed-off-by: PingWang <wang.ping5@zte.com.cn>

update

Signed-off-by: PingWang <wang.ping5@zte.com.cn>
@ping035627 @k8s-ci-robot
zh-trans:/docs/reference/setup-tools/kubeadm/kubeadm-upgrade-phase.md (…
fe1b75b 
…kubernetes#16951)

Signed-off-by: PingWang <wang.ping5@zte.com.cn>

update

Signed-off-by: PingWang <wang.ping5@zte.com.cn>

update

Signed-off-by: PingWang <wang.ping5@zte.com.cn>
@ping035627 @k8s-ci-robot
Remove redundant symbol and fix some ordered list (kubernetes#17000)
8792827 
Signed-off-by: PingWang <wang.ping5@zte.com.cn>

update

Signed-off-by: PingWang <wang.ping5@zte.com.cn>
@tanjunchen @k8s-ci-robot
update-zh-translation/docs/reference/setup-tools/kubeadm/kubeadm-init…
83d9cca 
….md (kubernetes#16997)
@tanjunchen @k8s-ci-robot
update zh translation kubeadm-reset.md kubeadm-upgrade.md (kubernetes…
204bdde 
…#16992)
@Sophy417 @k8s-ci-robot
Create kubeadm_join_phase_control-plane-join_all.md (kubernetes#16987)
9195c5c
@zhangx501 @k8s-ci-robot
Update web-ui-dashboard.md (kubernetes#16976)
bc7fb1e
@ping035627 @k8s-ci-robot
update format problem (kubernetes#16956)
b931794 
Signed-off-by: PingWang <wang.ping5@zte.com.cn>

update

Signed-off-by: PingWang <wang.ping5@zte.com.cn>
@pandaamanda @k8s-ci-robot
zh-trans:/docs/docs/concepts/storage/volume-pvc-datasource.md (kubern…
80351eb 
…etes#17021)
@tanjunchen @k8s-ci-robot
update zh translation /docs/reference/access-authn-authz/webhook.md (k…
2cd65db 
…ubernetes#16860)
@tanjunchen @k8s-ci-robot
fix confict update zh translation (kubernetes#16863)
ddd3887
@pandaamanda @tengqm @k8s-ci-robot
zh-trans:/docs/concepts/workloads/pods/disruptions.md (kubernetes#16983)
c5d77c2 
* zh-trans:/docs/concepts/workloads/pods/disruptions.md

* Update content/zh/docs/concepts/workloads/pods/disruptions.md

Co-Authored-By: Qiming <tengqim@cn.ibm.com>
@tanjunchen @k8s-ci-robot
update zh translation content/zh/docs/reference/command-line-tools-re…
f17729f 
…ference/kube-scheduler.md (kubernetes#17006)
@ping035627 @k8s-ci-robot
Update RC's link (kubernetes#16935)
74677b1 
Signed-off-by: PingWang <wang.ping5@zte.com.cn>

Update

Signed-off-by: PingWang <wang.ping5@zte.com.cn>

update the style

Signed-off-by: PingWang <wang.ping5@zte.com.cn>
@ping035627 @k8s-ci-robot
Update the links for /zh/docs/setup (kubernetes#16938)
5c7c339 
Signed-off-by: PingWang <wang.ping5@zte.com.cn>
@pandaamanda @k8s-ci-robot
zh-trans:/docs/docs/concepts/services-networking/dual-stack.md (kuber…
3f9220c 
…netes#17024)
@tanjunchen @k8s-ci-robot
update zh translation /reference/setup-tools/kubeadm/generated/kubead…
036b2df 
…m.md (kubernetes#17036)
@tanjunchen @k8s-ci-robot
update zh tanslation /reference/setup-tools/kubeadm/generated/kubeadm…
2d91b85 
…_alpha_kubelet_config_download.md (kubernetes#17037)
@tanjunchen @k8s-ci-robot
update zh translation -/reference/setup-tools/kubeadm/generated/kubea…
a2fe529 
…dm_alpha.md (kubernetes#17038)
@tanjunchen @k8s-ci-robot
update zh translation /docs/contribute/participating.md (kubernetes#1…
ba9d499 
…7040)
@ping035627 @k8s-ci-robot
Fix cri-o's links to match English docs (kubernetes#16936)
a78e13b 
Signed-off-by: PingWang <wang.ping5@zte.com.cn>
@tanjunchen @k8s-ci-robot
update zh translation content/zh/docs/reference/kubectl/jsonpath.md (k…
9723762 
…ubernetes#16862)
@tanjunchen @k8s-ci-robot
update zh translation /docs/reference/setup-tools/kubeadm/generated/k…
9ec1d42 
…ubeadm_token_generate.md (kubernetes#17049)
@tanjunchen @k8s-ci-robot
update Unkown -> Unknown (kubernetes#17062)
4201bdd
@yuxiaobo96 @k8s-ci-robot
zh-translation:high-availability.md (kubernetes#16960)
2167fd0 
Signed-off-by: yuxiaobo <yuxiaobogo@163.com>
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. language/zh Issues or PRs related to Chinese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Dec 21, 2019
@xichengliudui xichengliudui changed the title Merge release-1.16-temporary to release-1.17 ZH-trans: merge release-1.16-temporary to release-1.17 Dec 21, 2019
@chenrui333
Copy link
Member

Should be good by just adding content/zh/examples/controllers/nginx-deployment.yaml

9:45:21 AM: Error: Error building site: "/opt/build/repo/content/zh/docs/concepts/workloads/controllers/deployment.md:22:1": failed to render shortcode "capture": failed to process shortcode: "/opt/build/repo/layouts/shortcodes/codenew.html:14:16": execute of template failed: template: shortcodes/codenew.html:14:16: executing "shortcodes/codenew.html" at <readFile $filename>: error calling readFile: file "content/zh/examples/controllers/nginx-deployment.yaml" does not exist
9:45:21 AM: Function Dir: /opt/build/repo/functions
9:45:21 AM: Skipping functions preparation step: /opt/build/repo/functions not found

@sftim
Copy link
Contributor

sftim commented Dec 23, 2019

Should this change actually target the master branch? That's what most localizations seem to merge into when finishing a milestone.

@xichengliudui
Copy link
Contributor Author

Should this change actually target the master branch? That's what most localizations seem to merge into when finishing a milestone.

master #18217
release-1.16 #18216

@markthink
Copy link

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: markthink

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 Dec 25, 2019
@k8s-ci-robot k8s-ci-robot merged commit 2e622fc into kubernetes:release-1.17 Dec 25, 2019
chenrui333
chenrui333 reviewed Jan 1, 2020
View reviewed changes
Copy link
Member

@chenrui333 chenrui333 left a comment

Choose a reason for hiding this comment

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

Thanks for doing this!!

chenrui333
chenrui333 reviewed Jan 21, 2020
View reviewed changes
Copy link
Member

@chenrui333 chenrui333 left a comment

Choose a reason for hiding this comment

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

💯 Appreciate your efforts on this!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chenrui333 chenrui333 chenrui333 left review comments

@idealhack idealhack Awaiting requested review from idealhack

@markthink markthink Awaiting requested review from markthink

@SataQiu SataQiu Awaiting requested review from SataQiu

@zhangxiaoyu-zidif zhangxiaoyu-zidif Awaiting requested review from zhangxiaoyu-zidif

Assignees

@markthink markthink

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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.

None yet