Skip to content

bugfix: repair the script of creating k8s cluster with pouch in Ubuntu 16.04.5 #2632

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

Merged
merged 1 commit into from
Dec 28, 2018
Merged

bugfix: repair the script of creating k8s cluster with pouch in Ubuntu 16.04.5 #2632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions hack/kubernetes/allinone.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ install_pouch_ubuntu() {
add-apt-repository "deb http://mirrors.aliyun.com/opsx/pouch/linux/debian/ pouch stable"
apt-get -y update
apt-get install -y pouch
systemctl enable pouch
systemctl start pouch
}

Expand All @@ -68,9 +67,14 @@ install_pouch_centos() {
}

config_pouch_ubuntu() {
sed -i "s/ExecStart=\/usr\/bin\/pouchd/ExecStart=\/usr\/bin\/pouchd --enable-cri=true --cri-version=$CRI_VERSION/g" /usr/lib/systemd/system/pouch.service
mkdir -p /etc/systemd/system/pouch.service.d
cat > /etc/systemd/system/pouch.service.d/pouch.conf <<EOF
[Service]
ExecStart=
ExecStart=/usr/local/bin/pouchd --enable-cri=true --cri-version=$CRI_VERSION
EOF
systemctl daemon-reload
systemctl restart pouch
systemctl restart pouch
}

config_pouch_centos() {
Expand Down
3 changes: 1 addition & 2 deletions hack/kubernetes/allinone_aliyun.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ install_pouch_ubuntu() {
add-apt-repository "deb http://mirrors.aliyun.com/opsx/pouch/linux/debian/ pouch stable"
apt-get -y update
apt-get install -y pouch
systemctl enable pouch
systemctl start pouch
}

Expand All @@ -90,7 +89,7 @@ config_pouch_ubuntu() {
cat > /etc/systemd/system/pouch.service.d/pouch.conf <<EOF
[Service]
ExecStart=
ExecStart=/usr/bin/pouchd --enable-cri=true --cri-version=$CRI_VERSION
ExecStart=/usr/local/bin/pouchd --enable-cri=true --cri-version=$CRI_VERSION
EOF
systemctl daemon-reload
systemctl restart pouch
Expand Down