754dcd5242
Signed-off-by: jikai <jikai11@huawei.com> (cherry picked from commit 35815058031561339484cdbdff29d3c4beef7a99)
43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
From 3bcb8f3f60abb6ab6cde999cadb6a836744d4104 Mon Sep 17 00:00:00 2001
|
|
From: jikai <jikai11@huawei.com>
|
|
Date: Thu, 11 Jan 2024 19:00:19 +0800
|
|
Subject: [PATCH 01/14] add systemd-cgroup field in isulad and shim config
|
|
|
|
Signed-off-by: jikai <jikai11@huawei.com>
|
|
---
|
|
src/json/schema/isulad-daemon-configs.json | 3 +++
|
|
src/json/schema/shim/client/process-state.json | 3 +++
|
|
2 files changed, 6 insertions(+)
|
|
|
|
diff --git a/src/json/schema/isulad-daemon-configs.json b/src/json/schema/isulad-daemon-configs.json
|
|
index 7a8657c..46cf9e2 100644
|
|
--- a/src/json/schema/isulad-daemon-configs.json
|
|
+++ b/src/json/schema/isulad-daemon-configs.json
|
|
@@ -173,6 +173,9 @@
|
|
},
|
|
"enable-cri-v1": {
|
|
"type": "boolean"
|
|
+ },
|
|
+ "systemd-cgroup": {
|
|
+ "type": "boolean"
|
|
}
|
|
}
|
|
}
|
|
diff --git a/src/json/schema/shim/client/process-state.json b/src/json/schema/shim/client/process-state.json
|
|
index 2383b43..15dbe91 100644
|
|
--- a/src/json/schema/shim/client/process-state.json
|
|
+++ b/src/json/schema/shim/client/process-state.json
|
|
@@ -204,6 +204,9 @@
|
|
},
|
|
"logMaxsize": {
|
|
"type": "int64"
|
|
+ },
|
|
+ "systemdCgroup": {
|
|
+ "type": "boolean"
|
|
}
|
|
}
|
|
}
|
|
--
|
|
2.34.1
|
|
|