diff options
author | Guo Ruijing <ruijing.guo@intel.com> | 2019-01-17 06:30:07 +0800 |
---|---|---|
committer | Guo Ruijing <ruijing.guo@intel.com> | 2019-01-18 01:43:03 +0800 |
commit | 75bbfb0134de1fe140dedebe0fe30344ceb28312 (patch) | |
tree | 44a26ceede9d9c6ba0d1306c610522777f323526 /src/vagrant/kubeadm/kata/kata_setup.sh | |
parent | 2a287bd467b34740adef446425541fccf9bf681a (diff) |
some updates kata setup
1. fix in containerd private registry
2. master node using docker and worker node without docker
3. rebase containerd to 1.2.2
Change-Id: Ide2a45ed892134269995b8d96aa76d5c3362c6f3
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Diffstat (limited to 'src/vagrant/kubeadm/kata/kata_setup.sh')
-rw-r--r-- | src/vagrant/kubeadm/kata/kata_setup.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/vagrant/kubeadm/kata/kata_setup.sh b/src/vagrant/kubeadm/kata/kata_setup.sh index c60ae4e..4a23173 100644 --- a/src/vagrant/kubeadm/kata/kata_setup.sh +++ b/src/vagrant/kubeadm/kata/kata_setup.sh @@ -26,8 +26,8 @@ sudo -E apt-get -y install libseccomp2 wget https://github.com/opencontainers/runc/releases/download/v1.0.0-rc6/runc.amd64 sudo cp runc.amd64 /usr/sbin/runc sudo chmod 755 /usr/sbin/runc -wget http://github.com/containerd/containerd/releases/download/v1.2.1/containerd-1.2.1.linux-amd64.tar.gz >& /dev/null -sudo tar -C /usr/local -xzf containerd-1.2.1.linux-amd64.tar.gz +wget http://github.com/containerd/containerd/releases/download/v1.2.2/containerd-1.2.2.linux-amd64.tar.gz >& /dev/null +sudo tar -C /usr/local -xzf containerd-1.2.2.linux-amd64.tar.gz wget https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.13.0/crictl-v1.13.0-linux-amd64.tar.gz >& /dev/null sudo tar -C /usr/local/bin -xzf crictl-v1.13.0-linux-amd64.tar.gz echo "runtime-endpoint: unix:///run/containerd/containerd.sock" | sudo tee /etc/crictl.yaml @@ -39,6 +39,7 @@ sudo mkdir -p /opt/cni/bin sudo mkdir -p /etc/cni/net.d sudo mkdir -p /etc/containerd containerd config default | sudo tee /etc/containerd/config.toml +sudo sed -i "s,\[plugins.cri.registry.mirrors\],\[plugins.cri.registry.mirrors\]\n \[plugins.cri.registry.mirrors.\"registry:5000\"\]\n endpoint = \[\"http://registry:5000\"\]," /etc/containerd/config.toml sudo sed -i "/.*untrusted_workload_runtime.*/,+5s/runtime_type.*/runtime_type=\"io.containerd.runtime.v1.linux\"/" /etc/containerd/config.toml sudo sed -i "/.*untrusted_workload_runtime.*/,+5s/runtime_engine.*/runtime_engine=\"kata-runtime\"/" /etc/containerd/config.toml sudo systemctl restart containerd |