!218 [sync] PR-217: update from upstream to include feature remote ro

Merge pull request !218 from openeuler-sync-bot/sync-pr217-openEuler-23.03-to-master

0005-Add-memory-related-fields.patch

@@ -0,0 +1,38 @@
+From 3acca1f09f56d871fe38c741917822b96636b540 Mon Sep 17 00:00:00 2001
+From: "ilya.kuksenok" <ilya.kuksenok@huawei.com>
+Date: Wed, 8 Feb 2023 15:59:18 +0300
+Subject: [PATCH 5/8] Add memory related fields
+
+---
+ src/json/schema/container/info.json | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/src/json/schema/container/info.json b/src/json/schema/container/info.json
+index 8ce10af5..1db0ccf4 100644
+--- a/src/json/schema/container/info.json
++++ b/src/json/schema/container/info.json
+@@ -17,6 +17,21 @@
+     "cpu_use_user": {
+       "type": "uint64"
+     },
++    "avaliable_bytes": {
++      "type": "uint64"
++    },
++    "usage_bytes": {
++      "type": "uint64"
++    },
++    "rss_bytes": {
++      "type": "uint64"
++    },
++    "page_faults": {
++      "type": "uint64"
++    },
++    "major_page_faults": {
++      "type": "uint64"
++    },
+     "cpu_use_kernel": {
+       "type": "uint64"
+     },
+-- 
+2.25.1
+

0006-mod-headers.patch

@@ -0,0 +1,28 @@
+From aa7af4993648e2d1fe002fabf2c103ae728d5888 Mon Sep 17 00:00:00 2001
+From: "ilya.kuksenok" <ilya.kuksenok@huawei.com>
+Date: Tue, 14 Feb 2023 14:01:46 +0300
+Subject: [PATCH 6/8] mod headers
+
+---
+ src/lcrcontainer.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/lcrcontainer.h b/src/lcrcontainer.h
+index 5134b59d..a222ac97 100644
+--- a/src/lcrcontainer.h
++++ b/src/lcrcontainer.h
+@@ -90,6 +90,11 @@ struct lcr_container_state {
+     /* Memory usage */
+     uint64_t mem_used;
+     uint64_t mem_limit;
++    uint64_t avaliable_bytes;
++    uint64_t usage_bytes;
++    uint64_t rss_bytes;
++    uint64_t page_faults;
++    uint64_t major_page_faults;
+     /* Kernel Memory usage */
+     uint64_t kmem_used;
+     uint64_t kmem_limit;
+-- 
+2.25.1
+

0007-add-cgroup-resources-json-schema-for-isula-update.patch

@@ -0,0 +1,100 @@
+From 6ca6e250fc0cc10290c6e495168b29e09e2a70e9 Mon Sep 17 00:00:00 2001
+From: zhongtao <zhongtao17@huawei.com>
+Date: Wed, 15 Feb 2023 16:05:39 +0800
+Subject: [PATCH 7/8] add cgroup resources json schema for isula update
+
+Signed-off-by: zhongtao <zhongtao17@huawei.com>
+---
+ .../schema/shim/client/cgroup-resources.json  | 58 +++++++++++++++++++
+ .../schema/shim/client/process-state.json     |  1 +
+ .../schema/shim/client/runtime-stats.json     |  1 +
+ 3 files changed, 60 insertions(+)
+ create mode 100644 src/json/schema/shim/client/cgroup-resources.json
+
+diff --git a/src/json/schema/shim/client/cgroup-resources.json b/src/json/schema/shim/client/cgroup-resources.json
+new file mode 100644
+index 00000000..10310710
+--- /dev/null
++++ b/src/json/schema/shim/client/cgroup-resources.json
+@@ -0,0 +1,58 @@
++{
++    "_comment": "third party depend: runc",
++    "description": "cgroup resources",
++    "type": "object",
++    "properties": {
++        "blockIO": {
++            "type": "object",
++            "properties": {
++                "weight": {
++                    "$ref": "../../defs.json#/definitions/uint64"
++                }
++            }
++        },
++        "cpu": {
++            "type": "object",
++            "properties": {
++                "shares": {
++                    "$ref": "../../defs.json#/definitions/uint64"
++                },
++                "period": {
++                    "$ref": "../../defs.json#/definitions/uint64"
++                },
++                "quota": {
++                    "$ref": "../../defs.json#/definitions/int64"
++                },
++                "realtimeRuntime": {
++                    "$ref": "../../defs.json#/definitions/int64"
++                },
++                "realtimePeriod": {
++                    "$ref": "../../defs.json#/definitions/int64"
++                },
++                "cpus": {
++                    "type": "string"
++                },
++                "mems": {
++                    "type": "string"
++                }
++            }
++        },
++        "memory": {
++            "type": "object",
++            "properties": {
++                "limit": {
++                    "$ref": "../../defs.json#/definitions/uint64"
++                },
++                "swap": {
++                    "$ref": "../../defs.json#/definitions/uint64"
++                },
++                "reservation": {
++                    "$ref": "../../defs.json#/definitions/uint64"
++                },
++                "kernel": {
++                    "$ref": "../../defs.json#/definitions/uint64"
++                }
++            }
++        }
++    }
++}
+diff --git a/src/json/schema/shim/client/process-state.json b/src/json/schema/shim/client/process-state.json
+index 05f55fc5..f07d14f1 100644
+--- a/src/json/schema/shim/client/process-state.json
++++ b/src/json/schema/shim/client/process-state.json
+@@ -1,4 +1,5 @@
+ {
++    "_comment": "third party depend: runc",
+     "description": "process state info",
+     "type": "object",
+     "required": [
+diff --git a/src/json/schema/shim/client/runtime-stats.json b/src/json/schema/shim/client/runtime-stats.json
+index 6ed9473d..ae77e9db 100644
+--- a/src/json/schema/shim/client/runtime-stats.json
++++ b/src/json/schema/shim/client/runtime-stats.json
+@@ -1,4 +1,5 @@
+ {
++    "_comment": "third party depend: runc",
+     "description": "runtime stats",
+     "type": "object",
+     "properties": {
+-- 
+2.25.1
+

0008-add-field-for-isulad-daemon-configs.patch

@@ -0,0 +1,27 @@
+From 825554c1318b94edd29d4f22a9c5cbc3270cf277 Mon Sep 17 00:00:00 2001
+From: "Neil.wrz" <wangrunze13@huawei.com>
+Date: Wed, 15 Feb 2023 19:11:45 -0800
+Subject: [PATCH 8/8] add field for isulad daemon configs
+
+Signed-off-by: Neil.wrz <wangrunze13@huawei.com>
+---
+ src/json/schema/isulad-daemon-configs.json | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/json/schema/isulad-daemon-configs.json b/src/json/schema/isulad-daemon-configs.json
+index b1f60cf1..9ac8ee04 100644
+--- a/src/json/schema/isulad-daemon-configs.json
++++ b/src/json/schema/isulad-daemon-configs.json
+@@ -46,6 +46,9 @@
+         "storage-opts": {
+             "type": "ArrayOfStrings"
+         },
++        "storage-enable-remote-layer": {
++            "type": "boolean" 
++        },
+         "pidfile": {
+             "type": "string"
+         },
+-- 
+2.25.1
+

lcr.spec

@@ -1,5 +1,5 @@
 %global _version 2.1.1
-%global _release 4
+%global _release 5
 %global _inner_name isula_libutils
 
 Name:      lcr
@@ -16,6 +16,10 @@ Patch0001:	0001-add-libisula.pc.patch
 Patch0002:	0002-add-unified-and-memory_swap_limit_in_bytes-into-host.patch
 Patch0003:	0003-fix-update-cpu-rt-period-failed.patch
 Patch0004:	0004-fix-writing-config-line-with-wrong-length.patch
+Patch0005:	0005-Add-memory-related-fields.patch
+Patch0006:	0006-mod-headers.patch
+Patch0007:	0007-add-cgroup-resources-json-schema-for-isula-update.patch
+Patch0008:	0008-add-field-for-isulad-daemon-configs.patch
 
 %define lxcver_lower 4.0.3-2022102400
 %define lxcver_upper 4.0.3-2022102500
@@ -134,6 +138,12 @@ rm -rf %{buildroot}
 %{_includedir}/%{_inner_name}/*.h
 
 %changelog
+* Tue Feb 21 2023 wangrunze <wangrunze13@loongson.cn> - 2.1.1-5
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:update from upstream to include feature remote ro
+
 * Tue Feb 21 2023 Wenlong Zhang<zhangwenlong@loongson.cn> - 2.1.1-4
 - Type:enhancement
 - CVE:NA