18db649943
This commit implements kuryr-daemon support when KURYR_K8S_CONTAINERIZED_DEPLOYMENT=True. It's done by: * CNI docker image installs Kuryr-Kubernetes pip package and adds exectution of kuryr-daemon into entrypoint script. * Hosts /proc and /var/run/openvswitch are mounted into the CNI container. * Code is changed to use /host_proc instead of /proc when in a container (it's impossible to mount host's /proc into container's /proc). Implements: blueprint cni-split-exec-daemon Change-Id: I9155a2cba28f578cee129a4c40066209f7ab543d
13 lines
627 B
Diff
13 lines
627 B
Diff
--- /root/tmp/kuryr-kubernetes/kuryr_kubernetes/cni/main.py 2017-06-19 07:15:39.898398766 -0400
|
|
+++ kuryr_kubernetes/cni/main.py 2017-06-22 04:28:41.421123949 -0400
|
|
@@ -54,6 +54,9 @@ class K8sCNIPlugin(cni_api.CNIPlugin):
|
|
self._watcher.stop()
|
|
|
|
def _setup(self, params):
|
|
+ ovs = os_vif._EXT_MANAGER['ovs'].obj
|
|
+ ovs_mod = sys.modules[ovs.__module__]
|
|
+ ovs_mod.linux_net.privsep.vif_plug.start(ovs_mod.linux_net.privsep.priv_context.Method.FORK)
|
|
clients.setup_kubernetes_client()
|
|
self._pipeline = h_cni.CNIPipeline()
|
|
self._watcher = k_watcher.Watcher(self._pipeline)
|