From d47ba2b2ef5a18aaebc4d14b70605cc11ef9665f Mon Sep 17 00:00:00 2001
From: Bas van den Brink <basvandenbrink@users.noreply.github.com>
Date: Sat, 28 Nov 2020 17:52:47 +0100
Subject: [PATCH] Disable CRI-O restart by Multus (#6930)
---
roles/network_plugin/multus/templates/multus-daemonset.yml.j2 | 3 ---
1 file changed, 3 deletions(-)
diff --git a/roles/network_plugin/multus/templates/multus-daemonset.yml.j2 b/roles/network_plugin/multus/templates/multus-daemonset.yml.j2
index 9f8c3a1fe..de1f5e99d 100644
--- a/roles/network_plugin/multus/templates/multus-daemonset.yml.j2
+++ b/roles/network_plugin/multus/templates/multus-daemonset.yml.j2
@@ -35,9 +35,6 @@ spec:
- "--multus-conf-file={{ multus_conf_file }}"
- "--multus-kubeconfig-file-host={{ multus_kubeconfig_file_host }}"
- "--cni-version={{ multus_cni_version }}"
-{% if container_manager == 'crio' %}
- - "--restart-crio=true"
-{% endif %}
resources:
requests:
cpu: "100m"
--
GitLab