!102 config-v2 and inspect were modified to support modifications on isulad

From: @chengzrz
Reviewed-by: @duguhaotian
Signed-off-by: @duguhaotian
This commit is contained in:
openeuler-ci-bot 2021-11-23 03:19:35 +00:00 committed by Gitee
commit 705a451be0
2 changed files with 56 additions and 1 deletions

View File

@ -0,0 +1,48 @@
From a4ad5c5d0a428d1e603e91d14585f942e0e7453c Mon Sep 17 00:00:00 2001
From: chengzrz <czrzrichard@gmail.com>
Date: Thu, 11 Nov 2021 16:47:58 +0800
Subject: [PATCH] config-v2 and inspect were modified to support modifications
on isulad
Signed-off-by: chengzrz <czrzrichard@gmail.com>
---
src/json/schema/container/config-v2.json | 8 ++++++++
src/json/schema/container/inspect.json | 3 +++
2 files changed, 11 insertions(+)
diff --git a/src/json/schema/container/config-v2.json b/src/json/schema/container/config-v2.json
index c4964d4..0e64d14 100644
--- a/src/json/schema/container/config-v2.json
+++ b/src/json/schema/container/config-v2.json
@@ -43,6 +43,14 @@
"BaseFs": {
"type": "string"
},
+ "NetworkSettings": {
+ "type": "object",
+ "properties": {
+ "SandboxKey": {
+ "type": "string"
+ }
+ }
+ },
"MountPoints": {
"type": "object",
"patternProperties": {
diff --git a/src/json/schema/container/inspect.json b/src/json/schema/container/inspect.json
index 66307bc..ef7792f 100644
--- a/src/json/schema/container/inspect.json
+++ b/src/json/schema/container/inspect.json
@@ -182,6 +182,9 @@
"properties": {
"IPAddress": {
"type": "string"
+ },
+ "SandboxKey":{
+ "type": "string"
}
}
}
--
2.25.1

View File

@ -1,5 +1,5 @@
%global _version 2.0.6 %global _version 2.0.6
%global _release 4 %global _release 5
%global _inner_name isula_libutils %global _inner_name isula_libutils
Name: lcr Name: lcr
@ -16,6 +16,7 @@ Patch1: 0001-modified-ipconfig.json-to-adapt-to-newest-version-of.patch
Patch2: 0002-disable-lxc_keep-with-oci-image.patch Patch2: 0002-disable-lxc_keep-with-oci-image.patch
Patch3: 0003-add-self-def-runtime-for-shimv2.patch Patch3: 0003-add-self-def-runtime-for-shimv2.patch
Patch4: 0004-move-cri-runtimes-to-daemon.patch Patch4: 0004-move-cri-runtimes-to-daemon.patch
Patch5: 0005-config-v2-and-inspect-were-modified-to-support-modif.patch
%define lxcver 4.0.3-2021012801 %define lxcver 4.0.3-2021012801
@ -104,6 +105,12 @@ rm -rf %{buildroot}
%{_includedir}/%{_inner_name}/*.h %{_includedir}/%{_inner_name}/*.h
%changelog %changelog
* Tue Nov 23 2021 chengzeruizhi <chengzeruizhi@huawei.com> - 2.0.6-5
- Type:enhancement
- ID:NA
- SUG:NA
- DESC: add new fields in config v2 and inspect to support modifications on iSulad
* Fri Nov 19 2021 gaohuatao <gaohuatao@huawei.com> - 2.0.6-4 * Fri Nov 19 2021 gaohuatao <gaohuatao@huawei.com> - 2.0.6-4
- Type:enhancement - Type:enhancement
- ID:NA - ID:NA