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

Fix some bugs and add fabric #566

Merged
merged 38 commits into from
Aug 5, 2017
Merged

Fix some bugs and add fabric #566

merged 38 commits into from
Aug 5, 2017

Conversation

gongweibao
Copy link
Contributor

@gongweibao gongweibao commented Jul 28, 2017 •
edited by pineking
Loading

Fix #567
Fix #571

Yancey1989
Yancey1989 reviewed Jul 28, 2017
View reviewed changes
golang/template/cluster-desc.sample.yaml
healthz: "pineking/exechealthz-amd64:1.2"
addon_manager: "pineking/kube-addon-manager-amd64:v6.4-alpha.3"
kubedns: "pineking/kubedns-amd64:1.9"
hyperkube: "gcr.io/google_containers/hyperkube-amd64:v1.6.2"
Copy link
Contributor

Choose a reason for hiding this comment

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

尽量把镜像转到Docker hub上吧，gcr的镜像不翻墙是下不来的。

Copy link
Contributor Author

Choose a reason for hiding this comment

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

我看了一下脚本里边，为了不翻墙做了很多冗余的工作。
所以，我想我们应该设定这个脚本运行在一个可以翻墙的环境里边。这样，脚本很多地方会变得非常简单。

Copy link
Contributor

Choose a reason for hiding this comment

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

嗯，模版里统一用官方的镜像好点。

typhoonzero
typhoonzero reviewed Jul 28, 2017
View reviewed changes
docker/Dockerfile Outdated
@@ -9,7 +8,7 @@ apk add dnsmasq openssl
# Upload Sextant Go programs and retrieve dependencies.
RUN mkdir -p /go/bin
COPY cloud-config-server /go/bin
COPY registry /go/bin
#COPY registry /go/bin
Copy link
Contributor

Choose a reason for hiding this comment

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

No comment out lines please!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

golang/template/cluster-desc.sample.yaml Outdated
download_kernel: n
centos_version: "7.3.1611"
download_kernel: y
# mirror_site, please check that $mirror_site/$centos_version/(isos|os) exist.
Copy link
Contributor

Choose a reason for hiding this comment

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

Add # IMPORTANT: at the beginning.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

golang/template/cluster-desc.sample.yaml Outdated
# http://mirrors.163.com/centos
# http://vault.centos.org/
mirror_site: http://vault.centos.org
# please note this version number, it's important.
Copy link
Contributor

Choose a reason for hiding this comment

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

# please note this version number, it's important. => # Configure the centos version for isos and rpms

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

golang/template/cluster-desc.sample.yaml Outdated
ceph: "typhoon1986/ceph-daemon:tag-build-master-jewel-ubuntu-14.04-fix370"
default_backend: "yancey1989/defaultbackend:1.0"
ntp: "redaphid/docker-ntp-server"
heapster: "kubernetes/heapster:canary"
grafana: "lupan/heapster_grafana:v2.6.0-2"
influxdb: "lupan/heapster_influxdb:v0.5"
dashboard: "pineking/kubernetes-dashboard-amd64:v1.6.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

Change this image to the gcr.io version too.

scripts/centos.sh Outdated
@@ -4,11 +4,14 @@ GPU_DIR='gpu_drivers'
ABSOLUTE_GPU_DIR="$BSROOT/html/static/CentOS7/$GPU_DIR"
HTTP_GPU_DIR="http://$BS_IP/static/CentOS7/$GPU_DIR"

RED='\033[0;31m'
GREEN='\033[0;32m'
RESET="\033[0;0m"
Copy link
Contributor

Choose a reason for hiding this comment

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

赞👍。

@gongweibao gongweibao changed the title Fix some bugs [WIP]Fix some bugs and add fabric Jul 29, 2017
@pineking
Copy link
Contributor

@gongweibao 这个没问题是不是可以先 merge，可以分多次提 PR，避免很多功能糅合在一个 PR 里，每个 PR 越独立越简单越好。

@pineking
Copy link
Contributor

在 #567 comment 是否可以讨论下统一下，避免浪费人力？

@gongweibao gongweibao changed the title [WIP]Fix some bugs and add fabric Fix some bugs and add fabric Aug 3, 2017
@gongweibao gongweibao mentioned this pull request Aug 3, 2017
Closed
pineking
pineking reviewed Aug 3, 2017
View reviewed changes
fabric/upgrade_kenerl.py Outdated
@@ -0,0 +1,65 @@
from __future__ import with_statement
Copy link
Contributor

Choose a reason for hiding this comment

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

文件名 typo，kenerl -> kernel

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks.Done.

golang/template/cluster-desc.sample.yaml Outdated
ntp: "redaphid/docker-ntp-server"
heapster: "kubernetes/heapster:canary"
grafana: "lupan/heapster_grafana:v2.6.0-2"
influxdb: "lupan/heapster_influxdb:v0.5"
dashboard: "pineking/kubernetes-dashboard-amd64:v1.6.0"
dashboard: "pgcr.io/google_containers/kubernetes-dashboard-amd64:v1.6.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

pgcr -> gcr?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

多谢。用vim的时候按错了估计。

scripts/centos.sh
KERNEL_LT=$(ls ${BSROOT}/html/static/CentOS7/repo/cloudinit/kernel-lt-*)
if [[ -n ${KERNEL_LT} ]]; then
REPO_IMAGES=${REPO_IMAGES} + 'kernel-lt kernel-devel'
REPO_IMAGES=${REPO_IMAGES}' kernel-lt kernel-devel'
Copy link
Contributor

Choose a reason for hiding this comment

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

kernel-lt-devel ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

对。

fabric/upgrade_kenerl.py Outdated

@parallel
def upgrade():
put("./upgrade_kenerl.sh", "/tmp/upgrade_kenerl.sh")
Copy link
Contributor

Choose a reason for hiding this comment

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

kenerl.sh -> kernel.sh

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

fabric/README_CN.md Outdated

# 步骤三：升级kernel
```
fab -f gpu_driver.py prepare
Copy link
Contributor

Choose a reason for hiding this comment

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

update_kernel.py ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

docker/entrypoint.sh
exit 1
fi

if [[ $1 == " y" ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

“ y” 引号里有一空格？

Copy link
Contributor Author

@gongweibao gongweibao Aug 5, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

是的。脚本解析yaml文件的时候有一个空格。

typhoonzero
typhoonzero approved these changes Aug 5, 2017
View reviewed changes
Copy link
Contributor

@typhoonzero typhoonzero left a comment

Choose a reason for hiding this comment

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

LGTM++

@typhoonzero typhoonzero merged commit 962105f into k8sp:develop Aug 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Yancey1989 Yancey1989 Yancey1989 left review comments

@pineking pineking pineking left review comments

@typhoonzero typhoonzero typhoonzero approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@gongweibao @pineking @Yancey1989 @typhoonzero