Skip to content

Conversation

@starnop
Copy link
Contributor

@starnop starnop commented Jun 4, 2018

Signed-off-by: Starnop [email protected]

Ⅰ. Describe what this PR did

Modify the document about Deploy Kubernetes With Pouch to make it friendly

Ⅱ. Does this pull request fix one issue?

None

Ⅲ. Describe how you did it

Modify the document docs/kubernetes/pouch_with_kubernetes_deploying.md
Add script file hack/kubernetes/allinone_aliyun.sh
Update script file hack/kubernetes/allinone.sh
By the way , @idealhack

govendor update github.com/alibaba/pouch/vendor/k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2

Ⅳ. Describe how to verify it

Execute the script file, and then choose the option that you want :

----------------------------------
Please choose the version of kubernetes
(1) kubernetes 1.9
(2) kubernetes 1.10
(0) exit
----------------------------------
1
KUBERNETES_VERSION: 1.9.4
----------------------------------
Whether to configure CNI config ?
(Y/y) Y
(N/n) N
(0) exit
----------------------------------
y
CONFIG_CNI:true
----------------------------------
Is it the master node ?
(Y/y) Y
(N/n) N
(0) exit
----------------------------------
y

After initializing the master node, you may get the following prompt:

You can now join any number of machines by running the following on each node
as root:

  kubeadm join --token $token ${master_ip:port} --discovery-token-ca-cert-hash $ca-cert

Ⅴ. Special notes for reviews

@codecov-io
Copy link

codecov-io commented Jun 4, 2018

Codecov Report

Merging #1459 into master will decrease coverage by 3.25%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1459      +/-   ##
==========================================
- Coverage   40.49%   37.23%   -3.26%     
==========================================
  Files         254      254              
  Lines       16533    17665    +1132     
==========================================
- Hits         6695     6578     -117     
- Misses       8975    10237    +1262     
+ Partials      863      850      -13
Impacted Files Coverage Δ
client/network_connect.go 0% <0%> (-100%) ⬇️
client/container_exec.go 0% <0%> (-80%) ⬇️
apis/server/container_bridge.go 53.8% <0%> (-29.09%) ⬇️
daemon/mgr/volume.go 54.92% <0%> (-25.49%) ⬇️
apis/server/volume_bridge.go 61.9% <0%> (-24.77%) ⬇️
apis/server/network_bridge.go 44.87% <0%> (-18.77%) ⬇️
daemon/mgr/container.go 35.29% <0%> (-14.01%) ⬇️
apis/server/utils.go 49.09% <0%> (-10.44%) ⬇️
daemon/mgr/spec_mount.go 60.39% <0%> (-9.82%) ⬇️
cri/v1alpha1/cri_utils.go 22.08% <0%> (-7.17%) ⬇️
... and 32 more

@starnop starnop force-pushed the cri-doc branch 5 times, most recently from d81badc to 6452b7a Compare June 4, 2018 07:24
@allencloud
Copy link
Collaborator

I think here we have a flaky test which is related to log, @fuweid :

FAIL: /go/src/github.com/alibaba/pouch/test/api_container_logs_test.go:52: APIContainerLogsSuite.TestNoShowStdoutAndShowStderr
/go/src/github.com/alibaba/pouch/test/api_container_logs_test.go:60:
    ...
/go/src/github.com/alibaba/pouch/test/util_api.go:25:
    c.Assert(resp.StatusCode, check.Equals, status, check.Commentf("Error:%s", got.Message))
... obtained int = 500
... expected int = 204
... Error:failed to destroy container: d73c6635a9c65d265fb67f4e6faa775f12b4454e6ad178807b99027bb8509452: failed to delete container: cannot delete running task d73c6635a9c65d265fb67f4e6faa775f12b4454e6ad178807b99027bb8509452: failed precondition

KUBERNETES_VERSION_UBUNTU="1.9.4-00"
KUBERNETES_VERSION_CENTOS="1.9.4"
echo "----------------------------------"
echo "Please choose the version of kubernetes"
Copy link
Contributor

Choose a reason for hiding this comment

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

How about a extra colon?
echo "Please choose the version of kubernetes" -> echo "Please choose the version of kubernetes:"

@starnop starnop force-pushed the cri-doc branch 10 times, most recently from 505766a to 24f6a9d Compare June 11, 2018 09:36
@YaoZengzeng
Copy link
Contributor

LGTM

@YaoZengzeng YaoZengzeng merged commit 38e50dc into AliyunContainerService:master Jun 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants