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

add cni plugins install #13

Merged
merged 1 commit into from
Jan 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ etcdctl
cfssl
cfssljson
dockin-docker/resources/package

cni-plugins-amd64-v0.6.0.tgz
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ for module in ${module_list[@]}
do
echo "building $module "
cd $SCRIPT_PATH/$module
./build.sh package $time
./build.sh package "dist"
cp dist/* $SCRIPT_PATH/dist/
done
2 changes: 1 addition & 1 deletion dockin-worker/build-custom.sh
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function package_install(){
update_file_code
tar_name="${SCRIPT_PATH}/dist/${name}_${version}_$1.tar.gz"

tar -zcvf ${tar_name} common conf install.sh uninstall.sh version/$k8s_version
tar -zcvf ${tar_name} cni common conf install.sh uninstall.sh version/$k8s_version
}

function package_upgrade(){
Expand Down
1 change: 1 addition & 0 deletions dockin-worker/cni/common/cni-plugins/.gitkeep
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# cni plugins amd64 package
10 changes: 9 additions & 1 deletion dockin-worker/version/v1.16.6/install/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ set -ex
current_dir=$(cd "$(dirname "$0")";pwd)
common_dir=${current_dir}/../../../common
install_config=${current_dir}/../../../conf/install.properties

cni_dir=${current_dir}/../../../cni

function log() {
level=$1
Expand Down Expand Up @@ -73,6 +73,14 @@ mv *-package dockin-package;
log INFO "loading images...";
for i in $(ls ./dockin-package/package/*.tar); do log INFO "loading $i"; docker load --input $i; done

# install cni plugin bin
mkdir -p /opt/cni/bin

cd $cni_dir/common/cni-plugins
tar zxvf cni-plugins-amd64-v0.6.0.tgz -C /opt/cni/bin
chmod +x /opt/cni/bin/*


# install kubectl kubeadm kubelet
kube_version="v1.16.6"
binary_dir="dockin-package/binary"
Expand Down