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 release 1.12 into release 1.13 #14171

Open
wants to merge 631 commits into
base: release-1.13
from

Conversation

@chenrui333
Copy link
Member

commented May 6, 2019

Capture the contributors' commits during the release migration
relates to #14014

  • PR from release-1.12 to release-1.13
  • Resolve conflicts
  • Filter out the non-zh contents

cc @fleeto @markthink

Original attempt PR: #14075

xichengliudui and others added some commits Dec 24, 2018

ZH-trans: Update coarse-parallel-processing-work-queue.md (#11862)
* ZH-trans: Update coarse-parallel-processing-work-queue.md

* Update coarse-parallel-processing-work-queue.md
zh-trans: add /docs/concepts/architecture/cloud-controller.md (#11799)
* docs/concepts/architecture/cloud-controller.md

* docs/concepts/architecture/cloud-controller.md

* docs/concepts/architecture/cloud-controller.md

* fix

* fix

* fix
zh-trans: /docs/contribute/style/kubernetes-components.md (#11838)
Signed-off-by: liyuan198251 <li.yuan4@zte.com.cn>

zh-trans: /docs/contribute/generate-ref-docs/kubernetes-components.md; update

Signed-off-by: liyuan198251 <li.yuan4@zte.com.cn>
ZH-trans: add Update define-environment-variable-container.md (#11859)
* Update define-environment-variable-container.md

* Update define-environment-variable-container.md

* Update define-environment-variable-container.md

* Update define-environment-variable-container.md

* Update define-environment-variable-container.md
Update fine-parallel-processing-work-queue.md (#11863)
* Update fine-parallel-processing-work-queue.md

* Update fine-parallel-processing-work-queue.md
zh-trans: add / docs/reference/setup-tools/kubeadm/kubeadm-join.md (#…
…11798)

* zh-trans: add / docs/reference/setup-tools/kubeadm/kubeadm-join.md

zh-trans: add / docs/reference/setup-tools/kubeadm/kubeadm-join.md

* Update kubeadm-join.md

* Create kubeadm_join.md
zh-trans: update docs/concepts/containers/images.md (#11877)
* zh-trans: update docs/concepts/containers/images.md

* zh-trans: update docs/concepts/containers/images.md
zh_trans: kubeadm_token_generate.md (#11884)
* zh_trans: kubeadm_token_generate.md

zh_trans: /docs/reference/setup-tools/kubeadm/generated/kubeadm_token_generate.md

* Better translation  

Better translation
 
zh-trans: add /docs/tasks/configure-pod-container/configure-pod-initi…
…alization.md (#11886)

zh-trans: add /docs/tasks/configure-pod-container/configure-pod-initialization.md
zh_trans: kubeadm_token_delete.md (#11883)
* zh_trans: kubeadm_token_delete.md

zh_trans: /docs/reference/setup-tools/kubeadm/generated/kubeadm_token_create.md

* fix tpye error

fix tpye error

*  Better translation  

Better translation
zh_trans: independent/create-cluster-kubeadm.md (#11882)
* zh_trans: independent/create-cluster-kubeadm.md

zh_trans: docs/setup/independent/create-cluster-kubeadm.md

* fix word style error

* fix type error

* better zhtran

better zhtran

* fix "Create" -> "create"

fix "Create" -> "create"
zh-trans: add docs⁩/concept⁨s/storage/storage-classes.md (#11788)
* ZH-trans: fixing formatting errors (#11661)

* ZH-trans: fixing formatting errors

* Update ZH-trans: fixing formatting errors

storage-classes zh part 1

* storage-classes zh trans

* fix typo

update trans for provisioner & fix typo

* fix typo

* 根据校对更新翻译
zh_trans: kubeadm-token.md (#11898)
zh_trans: /docs/reference/setup-tools/kubeadm/kubeadm-token.md
Merge pull request #11801 from zhangqx2010/1.12-web-ui-dashboard
zh-trans: add /docs/tasks/access-application-cluster/web-ui-dashboard.md
zh-trans: add /docs/tasks/configure-pod-container/quality-service-pod…
….md (#11900)

* zh-trans: add /docs/tasks/configure-pod-container/quality-service-pod.md

zh-trans: add /docs/tasks/configure-pod-container/quality-service-pod.md

* Update quality-service-pod.md
zh_trans: kubeadm_alpha_phase_bootstrap-token_node.md (#11897)
zh_trans: Path:/docs/reference/setup-tools/kubeadm/generated/kubeadm_alpha_phase_bootstrap-token_node.md
zh-trans: add /docs/concepts/storage/volumes.md (#11767)
* zh-trans: add /docs/concepts/storage/volumes.md

zh-trans: add /docs/concepts/storage/volumes.md

* Update volumes.md

* Update volumes.md

* self-review

* Update volumes.md
zh-trans: /docs/reference/glossary/approver.md (#11924)
zh-trans: /docs/reference/glossary/approver.md
zh-trans: add docs/setup/on-premises-vm/dcos.md (#11891)
* zh-trans: add docs/setup/on-premises-vm/dcos.md

* Update content/zh/docs/setup/on-premises-vm/dcos.md

Co-Authored-By: SataQiu <1527062125@qq.com>
zh-trans: /docs/tasks/configure-pod-container/configure-persistent-vo… (
#11915)

* zh-trans: /docs/tasks/configure-pod-container/configure-persistent-volume-storage.md

zh-trans: /docs/tasks/configure-pod-container/configure-persistent-volume-storage.md

* Update configure-persistent-volume-storage.md
zh_trans: kubeadm_alpha.md (#11902)
* zh_trans: kubeadm_alpha.md

zh_trans: /docs/reference/setup-tools/kubeadm/generated/kubeadm_alpha.md

* Better translation

Better translation
zh-trans: /docs/reference/glossary/downstream.md (#11931)
* zh-trans: /docs/reference/glossary/downstream.md

zh-trans: /docs/reference/glossary/downstream.md

* Update downstream.md

* Update downstream.md
@netlify

This comment has been minimized.

Copy link

commented May 6, 2019

Deploy preview for k8s-v1-13 ready!

Built with commit fe25881

https://deploy-preview-14171--k8s-v1-13.netlify.com

@chenrui333 chenrui333 force-pushed the chenrui333:merge-release-1.12-into-release-1.13 branch from 41e5883 to 9ff0d83 May 6, 2019

@chenrui333

This comment has been minimized.

Copy link
Member Author

commented May 6, 2019

10:53:12 PM: Error: Error building site: "/opt/build/repo/content/zh/docs/reference/setup-tools/kubeadm/generated/README.md:2:1": starting HTML comment with no end
10:53:12 PM: Error running command: Build script returned non-zero exit code: 255
10:53:12 PM: Failing build: Failed to build site
10:53:12 PM: failed during stage 'building site': Build script returned non-zero exit code: 255
10:53:12 PM: Finished processing build request in 1m9.780047701s
10:53:12 PM: Shutting down logging, 0 messages pending

@chenrui333 chenrui333 force-pushed the chenrui333:merge-release-1.12-into-release-1.13 branch from 9ff0d83 to 06271d9 May 6, 2019

@chenrui333

This comment has been minimized.

Copy link
Member Author

commented May 6, 2019

Just chose to remove that md file for simplicity. 😄

@tengqm

This comment has been minimized.

Copy link
Contributor

commented May 6, 2019

/hold
@chenrui333 is this ready?

@SataQiu

This comment has been minimized.

Copy link
Member

commented May 6, 2019

One tip @chenrui333 :
You need to remove the files that are not in content/zh.
And then we can merge it.
图片

@chenrui333

This comment has been minimized.

Copy link
Member Author

commented May 6, 2019

@tengqm yeah, it is almost ready besides removing some new files.

@SataQiu I will remove those new files.

@k8s-ci-robot

This comment has been minimized.

Copy link

commented May 6, 2019

Keywords which can automatically close issues and at(@) mentions are not allowed in commit messages.

The list of commits with invalid commit messages:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@chenrui333

This comment has been minimized.

Copy link
Member Author

commented May 6, 2019

@SataQiu Removed the generated sass assets.

Also, a quick question, do I need to remove all the contents show as added?

@SataQiu

This comment has been minimized.

Copy link
Member

commented May 7, 2019

@chenrui333
We just need to make sure we don't change anything other than the content/zh.
I think that's enough.

@SataQiu

This comment has been minimized.

Copy link
Member

commented May 7, 2019

/lgtm
/approve

@k8s-ci-robot

This comment has been minimized.

Copy link

commented May 7, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: markthink, SataQiu

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

@zhangxiaoyu-zidif

This comment has been minimized.

Copy link
Member

commented May 7, 2019

/hold cancel

@zhangxiaoyu-zidif

This comment has been minimized.

Copy link
Member

commented May 7, 2019

It's really not easy to review... :(
some nits could be patched later.

@chenrui333

This comment has been minimized.

Copy link
Member Author

commented May 10, 2019

1 similar comment
@chenrui333

This comment has been minimized.

Copy link
Member Author

commented May 16, 2019

@xichengliudui

This comment has been minimized.

Copy link
Contributor

commented May 16, 2019

/remove-invalid-commit-message

@chenrui333

This comment has been minimized.

Copy link
Member Author

commented May 17, 2019

@xichengliudui that is probably not the right prow command 😆

@xichengliudui

This comment has been minimized.

Copy link
Contributor

commented May 21, 2019

can try to resubmit and add the submission information.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.