28 lines
769 B
Diff
28 lines
769 B
Diff
|
From c092597565e5f24b29ecd83b4b371a19a9c2db0d Mon Sep 17 00:00:00 2001
|
||
|
|
From: jikai <jikai11@huawei.com>
|
||
|
|
Date: Wed, 17 Apr 2024 01:52:45 +0000
|
||
|
|
Subject: [PATCH 63/69] remove default systemd-cgroup and enable-cri-v1 value
|
||
|
|
in daemon.json
|
||
|
|
|
||
|
|
Signed-off-by: jikai <jikai11@huawei.com>
|
||
|
|
---
|
||
|
|
src/contrib/config/daemon.json | 4 +---
|
||
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/contrib/config/daemon.json b/src/contrib/config/daemon.json
|
||
|
|
index 69362c26..711dda94 100644
|
||
|
|
--- a/src/contrib/config/daemon.json
|
||
|
|
+++ b/src/contrib/config/daemon.json
|
||
|
|
@@ -35,7 +35,5 @@
|
||
|
|
"insecure-skip-verify-enforce": false,
|
||
|
|
"cri-runtimes": {
|
||
|
|
"kata": "io.containerd.kata.v2"
|
||
|
|
- },
|
||
|
|
- "enable-cri-v1": false,
|
||
|
|
- "systemd-cgroup": false
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|