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

docs: update the doc of deploy kubernetes with PouchContainer #2294

Merged
merged 1 commit into from
Oct 11, 2018

Conversation

starnop
Copy link
Contributor

@starnop starnop commented Sep 30, 2018

Signed-off-by: Starnop starnop@163.com

Ⅰ. Describe what this PR did

After verification, our documentation is not enough for users to quickly build the environment. Now we update the items as follows:

  1. s/pouch/pouchcontainer
  2. add configuration instructions of CONTAINERD_ADDR
  3. create a new drop-in file instead of modifying the file created by the kubeadm
  4. correct any inappropriateness in the document

Ⅱ. Does this pull request fix one issue?

None.

Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗?)

just docs.

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

About more info about kubeadm/kubelet , please refer to:
kubernetes/kubeadm#822
https://v1-11.docs.kubernetes.io/docs/reference/setup-tools/kubeadm/kubeadm-init/

@codecov
Copy link

codecov bot commented Sep 30, 2018

Codecov Report

Merging #2294 into master will increase coverage by 0.05%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #2294      +/-   ##
=========================================
+ Coverage   66.74%   66.8%   +0.05%     
=========================================
  Files         211     211              
  Lines       17205   17205              
=========================================
+ Hits        11484   11493       +9     
+ Misses       4316    4309       -7     
+ Partials     1405    1403       -2
Flag Coverage Δ
#criv1alpha1test 32.19% <ø> (+0.05%) ⬆️
#criv1alpha2test 35.85% <ø> (-0.02%) ⬇️
#integrationtest 39.83% <ø> (-0.01%) ⬇️
#nodee2etest 33.01% <ø> (+0.01%) ⬆️
#unittest 23.46% <ø> (ø) ⬆️
Impacted Files Coverage Δ
daemon/containerio/cri_log_file.go 84.31% <0%> (-3.93%) ⬇️
cri/v1alpha2/cri_wrapper.go 60% <0%> (-2.4%) ⬇️
ctrd/container.go 59.28% <0%> (ø) ⬆️
cri/v1alpha2/cri.go 65.74% <0%> (ø) ⬆️
daemon/mgr/container.go 57.43% <0%> (+0.2%) ⬆️
cri/v1alpha2/cri_utils.go 90.57% <0%> (+0.28%) ⬆️
cri/v1alpha1/cri.go 60.7% <0%> (+0.32%) ⬆️
ctrd/watch.go 80.3% <0%> (+4.54%) ⬆️
apis/server/utils.go 66.66% <0%> (+4.76%) ⬆️
cri/ocicni/cni_manager.go 80% <0%> (+15%) ⬆️

@@ -2,19 +2,18 @@

Updated: 2018.6.1
Copy link
Collaborator

Choose a reason for hiding this comment

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

How about removing this line? @starnop

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated! ^_^

@allencloud
Copy link
Collaborator

Why has containerd's address changed? I think it is a big incompatibility there when deployment of kubernetes. @starnop
Could you show more details about this?

@starnop
Copy link
Contributor Author

starnop commented Oct 8, 2018

@allencloud
cadvisor has updated the address for no reason in this PR:
https://github.com/google/cadvisor/pull/1919/files

And Kubernetes update the cadvisor ,that's where the difference comes in:
kubernetes/kubernetes#64800

Signed-off-by: Starnop <starnop@163.com>
@allencloud
Copy link
Collaborator

LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Oct 11, 2018
@allencloud allencloud merged commit 41f5d46 into AliyunContainerService:master Oct 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
areas/docs areas/orchestration LGTM one maintainer or community participant agrees to merge the pull reuqest. size/M
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants