From 4554713bef99dcfc80ef9fc48788f4042881083e Mon Sep 17 00:00:00 2001 From: David Eads Date: Thu, 5 Nov 2020 14:06:23 -0500 Subject: [PATCH] Revert "crio: drop infra container when possible" This reverts commit 6eb37894974b71080648a92bbb71fd201c5a84f4. --- .../master/01-master-container-runtime/_base/files/crio.yaml | 1 - .../worker/01-worker-container-runtime/_base/files/crio.yaml | 1 - 2 files changed, 2 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 index 348a0e9b80..8600f25875 100644 --- a/templates/master/01-master-container-runtime/_base/files/crio.yaml +++ b/templates/master/01-master-container-runtime/_base/files/crio.yaml @@ -22,7 +22,6 @@ contents: "/run/containers/oci/hooks.d", ] manage_ns_lifecycle = true - drop_infra_ctr = true [crio.image] global_auth_file = "/var/lib/kubelet/config.json" diff --git a/templates/worker/01-worker-container-runtime/_base/files/crio.yaml b/templates/worker/01-worker-container-runtime/_base/files/crio.yaml index 348a0e9b80..8600f25875 100644 --- a/templates/worker/01-worker-container-runtime/_base/files/crio.yaml +++ b/templates/worker/01-worker-container-runtime/_base/files/crio.yaml @@ -22,7 +22,6 @@ contents: "/run/containers/oci/hooks.d", ] manage_ns_lifecycle = true - drop_infra_ctr = true [crio.image] global_auth_file = "/var/lib/kubelet/config.json"