diff options
author | Guo Ruijing <ruijing.guo@intel.com> | 2018-11-12 21:13:11 +0800 |
---|---|---|
committer | Guo Ruijing <ruijing.guo@intel.com> | 2018-11-12 21:15:38 +0800 |
commit | 8c2602aa5e99381dfbf9210c0b4e3a82976052f3 (patch) | |
tree | 2f4feb56809243436632ff1356b6998e7602461a /src/vagrant/kubeadm_virtlet/virtlet/etc/systemd/system/kubelet.service.d/20-criproxy.conf | |
parent | ec3b5f68c57cfd85cb1178614be40c9af9e34fad (diff) |
rebase virtlet
1. k8s 1.12.2, docker: 18.03
2. criproxy: 0.12.0, virtlet: v1.4.1
Change-Id: I826bad4407ef4d048f3307dface5683f7d9d10e6
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Diffstat (limited to 'src/vagrant/kubeadm_virtlet/virtlet/etc/systemd/system/kubelet.service.d/20-criproxy.conf')
-rw-r--r-- | src/vagrant/kubeadm_virtlet/virtlet/etc/systemd/system/kubelet.service.d/20-criproxy.conf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/vagrant/kubeadm_virtlet/virtlet/etc/systemd/system/kubelet.service.d/20-criproxy.conf b/src/vagrant/kubeadm_virtlet/virtlet/etc/systemd/system/kubelet.service.d/20-criproxy.conf deleted file mode 100644 index 412a48d..0000000 --- a/src/vagrant/kubeadm_virtlet/virtlet/etc/systemd/system/kubelet.service.d/20-criproxy.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Service] -Environment="KUBELET_EXTRA_ARGS=--container-runtime=remote --container-runtime-endpoint=/run/criproxy.sock --image-service-endpoint=/run/criproxy.sock --enable-controller-attach-detach=false" |