Merge pull request #1568 from haircommander/manage-ns-lifecycle

cri-o: set manage_ns_lifecycle to true
openshift · Mar 30, 2020 · f6bd286 · f6bd286
2 parents 68bf465 + 9b3e28d
commit f6bd286
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/templates/master/01-master-container-runtime/_base/files/crio.yaml b/templates/master/01-master-container-runtime/_base/files/crio.yaml
@@ -171,9 +171,9 @@ contents:
     # regarding the proper termination of the container.
     ctr_stop_timeout = 0
 
-    # ManageNetworkNSLifecycle determines whether we pin and remove network namespace
-    # and manage its lifecycle.
-    manage_network_ns_lifecycle = false
+    # ManageNSLifecycle determines whether we pin and remove namespaces
+    # and manage their lifecycle.
+    manage_ns_lifecycle = true
 
     # The "crio.runtime.runtimes" table defines a list of OCI compatible runtimes.
     # The runtime to use is picked based on the runtime_handler provided by the CRI.

diff --git a/templates/worker/01-worker-container-runtime/_base/files/crio.yaml b/templates/worker/01-worker-container-runtime/_base/files/crio.yaml
@@ -171,9 +171,9 @@ contents:
     # regarding the proper termination of the container.
     ctr_stop_timeout = 0
 
-    # ManageNetworkNSLifecycle determines whether we pin and remove network namespace
-    # and manage its lifecycle.
-    manage_network_ns_lifecycle = false
+    # ManageNSLifecycle determines whether we pin and remove namespaces
+    # and manage their lifecycle.
+    manage_ns_lifecycle = true
 
     # The "crio.runtime.runtimes" table defines a list of OCI compatible runtimes.
     # The runtime to use is picked based on the runtime_handler provided by the CRI.