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

feature: replace downloading k8s components from googleapis in allinone with apt from aliyun mirrors #2402

Merged
merged 1 commit into from
Nov 5, 2018

Conversation

mathspanda
Copy link
Contributor

Signed-off-by: mathspanda mathspanda826@gmail.com

Ⅰ. Describe what this PR did

Replace kubernetes deployment steps on ubuntu in allinone_aliyun.sh into apt-installing from aliyun mirrors, instead of downloading k8s components from googleapis.com.

Ⅱ. Does this pull request fix one issue?

#2397

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

None

Ⅳ. Describe how to verify it

hack/kubernetes/allinone_aliyun.sh

Ⅴ. Special notes for reviews

None

@codecov
Copy link

codecov bot commented Nov 1, 2018

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2402      +/-   ##
==========================================
+ Coverage   68.45%   68.48%   +0.02%     
==========================================
  Files         275      275              
  Lines       18291    18278      -13     
==========================================
- Hits        12522    12517       -5     
+ Misses       4340     4334       -6     
+ Partials     1429     1427       -2
Flag Coverage Δ
#criv1alpha1test 31.85% <ø> (+0.04%) ⬆️
#criv1alpha2test 35.87% <ø> (+0.04%) ⬆️
#integrationtest 39.79% <ø> (+0.02%) ⬆️
#nodee2etest 33.24% <ø> (-0.05%) ⬇️
#unittest 25.53% <ø> (+0.01%) ⬆️
Impacted Files Coverage Δ
daemon/mgr/spec_seccomp_unsupported.go 50% <0%> (-16.67%) ⬇️
cri/v1alpha2/cri_wrapper.go 60% <0%> (-1.21%) ⬇️
ctrd/container.go 59.28% <0%> (-0.48%) ⬇️
cri/v1alpha2/cri.go 68.05% <0%> (-0.24%) ⬇️
daemon/mgr/container.go 59.58% <0%> (ø) ⬆️
daemon/mgr/container_utils.go 86.7% <0%> (+1.26%) ⬆️
pkg/meta/store.go 67.69% <0%> (+1.53%) ⬆️
daemon/mgr/system.go 76.22% <0%> (+2.94%) ⬆️
ctrd/watch.go 83.33% <0%> (+4.54%) ⬆️
daemon/mgr/spec_seccomp_linux.go 78.94% <0%> (+7.51%) ⬆️

@mathspanda
Copy link
Contributor Author

@fuweid PTAL.

@@ -139,6 +139,7 @@ Environment="KUBELET_EXTRA_ARGS=--container-runtime=remote --container-runtime-e
EOF

sudo systemctl daemon-reload
sudo systemctl start kubelet
Copy link
Contributor

Choose a reason for hiding this comment

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

It's not necessary. :)

Copy link
Contributor Author

@mathspanda mathspanda Nov 1, 2018

Choose a reason for hiding this comment

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

Change it into restart. I think it might be necessary since kubelet config changed.

Copy link
Contributor

Choose a reason for hiding this comment

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

In fact, kubelet will be started automatically in the process of kubeadm init, but it's ok too. :)

Copy link
Contributor Author

@mathspanda mathspanda Nov 1, 2018

Choose a reason for hiding this comment

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

OK, i got it. THX. Delete it.

@starnop
Copy link
Contributor

starnop commented Nov 1, 2018

Have you tested it in your local environment? If not, please take it. Thanks!

@mathspanda
Copy link
Contributor Author

@starnop Have tested.

…m aliyun mirrors

Signed-off-by: mathspanda <mathspanda826@gmail.com>
@codecov
Copy link

codecov bot commented Nov 2, 2018

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2402      +/-   ##
==========================================
+ Coverage   68.45%   68.47%   +0.01%     
==========================================
  Files         275      275              
  Lines       18291    18291              
==========================================
+ Hits        12522    12524       +2     
+ Misses       4340     4339       -1     
+ Partials     1429     1428       -1
Flag Coverage Δ
#criv1alpha1test 31.66% <ø> (-0.16%) ⬇️
#criv1alpha2test 35.69% <ø> (-0.14%) ⬇️
#integrationtest 39.78% <ø> (+0.01%) ⬆️
#nodee2etest 33.28% <ø> (ø) ⬆️
#unittest 25.52% <ø> (ø) ⬆️
Impacted Files Coverage Δ
ctrd/container.go 58.33% <0%> (-1.43%) ⬇️
cri/v1alpha1/cri.go 60.38% <0%> (-0.65%) ⬇️
cri/v1alpha2/cri.go 68.05% <0%> (-0.24%) ⬇️
daemon/mgr/container.go 59.58% <0%> (ø) ⬆️
cri/v1alpha2/cri_wrapper.go 61.2% <0%> (ø) ⬆️
cri/v1alpha2/cri_utils.go 91.09% <0%> (+0.28%) ⬆️
daemon/mgr/container_utils.go 86.7% <0%> (+1.26%) ⬆️
pkg/meta/store.go 67.69% <0%> (+1.53%) ⬆️
ctrd/client.go 69.23% <0%> (+2.3%) ⬆️
daemon/mgr/events.go 100% <0%> (+3.7%) ⬆️
... and 1 more

1 similar comment
@codecov
Copy link

codecov bot commented Nov 2, 2018

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2402      +/-   ##
==========================================
+ Coverage   68.45%   68.47%   +0.01%     
==========================================
  Files         275      275              
  Lines       18291    18291              
==========================================
+ Hits        12522    12524       +2     
+ Misses       4340     4339       -1     
+ Partials     1429     1428       -1
Flag Coverage Δ
#criv1alpha1test 31.66% <ø> (-0.16%) ⬇️
#criv1alpha2test 35.69% <ø> (-0.14%) ⬇️
#integrationtest 39.78% <ø> (+0.01%) ⬆️
#nodee2etest 33.28% <ø> (ø) ⬆️
#unittest 25.52% <ø> (ø) ⬆️
Impacted Files Coverage Δ
ctrd/container.go 58.33% <0%> (-1.43%) ⬇️
cri/v1alpha1/cri.go 60.38% <0%> (-0.65%) ⬇️
cri/v1alpha2/cri.go 68.05% <0%> (-0.24%) ⬇️
daemon/mgr/container.go 59.58% <0%> (ø) ⬆️
cri/v1alpha2/cri_wrapper.go 61.2% <0%> (ø) ⬆️
cri/v1alpha2/cri_utils.go 91.09% <0%> (+0.28%) ⬆️
daemon/mgr/container_utils.go 86.7% <0%> (+1.26%) ⬆️
pkg/meta/store.go 67.69% <0%> (+1.53%) ⬆️
ctrd/client.go 69.23% <0%> (+2.3%) ⬆️
daemon/mgr/events.go 100% <0%> (+3.7%) ⬆️
... and 1 more

@fuweid
Copy link
Contributor

fuweid commented Nov 4, 2018

@starnop could we move on?

@starnop
Copy link
Contributor

starnop commented Nov 5, 2018

Sorry for delay it, I have tested it locally and LGTM. Thanks for your contribution. :)

@fuweid fuweid merged commit d41ecf0 into AliyunContainerService:master Nov 5, 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.

4 participants