43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
|
From 3297f92307fd8a733f5d72ad2a0a85f7e61fb473 Mon Sep 17 00:00:00 2001
|
||
|
|
From: gaohuatao <gaohuatao@huawei.com>
|
||
|
|
Date: Tue, 16 Nov 2021 18:53:33 +0800
|
||
|
|
Subject: [PATCH 4/4] move cri runtimes to daemon
|
||
|
|
|
||
|
|
Signed-off-by: gaohuatao <gaohuatao@huawei.com>
|
||
|
|
---
|
||
|
|
src/json/schema/isulad-daemon-configs.json | 3 +++
|
||
|
|
src/json/schema/isulad-daemon-constants.json | 3 ---
|
||
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/json/schema/isulad-daemon-configs.json b/src/json/schema/isulad-daemon-configs.json
|
||
|
|
index 27fd916..1134d37 100644
|
||
|
|
--- a/src/json/schema/isulad-daemon-configs.json
|
||
|
|
+++ b/src/json/schema/isulad-daemon-configs.json
|
||
|
|
@@ -26,6 +26,9 @@
|
||
|
|
"log-opts": {
|
||
|
|
"$ref": "defs.json#/definitions/mapStringString"
|
||
|
|
},
|
||
|
|
+ "cri-runtimes": {
|
||
|
|
+ "$ref": "defs.json#/definitions/mapStringString"
|
||
|
|
+ },
|
||
|
|
"container-log": {
|
||
|
|
"type": "object",
|
||
|
|
"properties": {
|
||
|
|
diff --git a/src/json/schema/isulad-daemon-constants.json b/src/json/schema/isulad-daemon-constants.json
|
||
|
|
index 7c03a6e..bb601b5 100644
|
||
|
|
--- a/src/json/schema/isulad-daemon-constants.json
|
||
|
|
+++ b/src/json/schema/isulad-daemon-constants.json
|
||
|
|
@@ -7,9 +7,6 @@
|
||
|
|
},
|
||
|
|
"registry-transformation": {
|
||
|
|
"$ref": "defs.json#/definitions/mapStringString"
|
||
|
|
- },
|
||
|
|
- "cri-shimv2-runtimes": {
|
||
|
|
- "$ref": "defs.json#/definitions/mapStringString"
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.20.1
|
||
|
|
|