From 6b33e5d83ac5fc6f0e56a7d520de89e0eae7e598 Mon Sep 17 00:00:00 2001 From: zhangxiaoyu Date: Mon, 24 Apr 2023 10:46:37 +0800 Subject: [PATCH] support update resources, remote-layer and files limit Signed-off-by: zhangxiaoyu (cherry picked from commit 7249c049dddead13dabcf736434186dbf511fff1) --- ...apt-to-repo-of-openeuler-url-changed.patch | 33 ++++++ ...sources-json-schema-for-isula-update.patch | 100 ++++++++++++++++++ ...-add-field-for-isulad-daemon-configs.patch | 27 +++++ 0006-add-files_limit-to-oci-spec.patch | 37 +++++++ lcr.spec | 12 ++- 5 files changed, 208 insertions(+), 1 deletion(-) create mode 100644 0003-adapt-to-repo-of-openeuler-url-changed.patch create mode 100644 0004-add-cgroup-resources-json-schema-for-isula-update.patch create mode 100644 0005-add-field-for-isulad-daemon-configs.patch create mode 100644 0006-add-files_limit-to-oci-spec.patch diff --git a/0003-adapt-to-repo-of-openeuler-url-changed.patch b/0003-adapt-to-repo-of-openeuler-url-changed.patch new file mode 100644 index 0000000..7a5e112 --- /dev/null +++ b/0003-adapt-to-repo-of-openeuler-url-changed.patch @@ -0,0 +1,33 @@ +From 2e6991000d0e1e42db9f054400949543a1a44520 Mon Sep 17 00:00:00 2001 +From: zhongtao +Date: Mon, 6 Mar 2023 15:24:59 +0800 +Subject: [PATCH 3/6] adapt to repo of openeuler url changed + +Signed-off-by: zhongtao +--- + CI/pr-gateway.sh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/CI/pr-gateway.sh b/CI/pr-gateway.sh +index ae1e8ef..1a15461 100755 +--- a/CI/pr-gateway.sh ++++ b/CI/pr-gateway.sh +@@ -14,7 +14,15 @@ + ##- @Create: 2022-02-22 + ####################################################################### + ++sed -i "s#http://repo.openeuler.org#https://repo.huaweicloud.com/openeuler#g" /etc/yum.repos.d/openEuler.repo ++ ++dnf update -y ++ + dnf install -y gtest-devel gmock-devel gtest gmock diffutils cmake gcc-c++ yajl-devel patch make libtool git chrpath zlib-devel ++if [ $? -ne 0 ]; then ++ echo "install dependences failed" ++ exit 1 ++fi + + cd ~ + +-- +2.25.1 + diff --git a/0004-add-cgroup-resources-json-schema-for-isula-update.patch b/0004-add-cgroup-resources-json-schema-for-isula-update.patch new file mode 100644 index 0000000..338a27c --- /dev/null +++ b/0004-add-cgroup-resources-json-schema-for-isula-update.patch @@ -0,0 +1,100 @@ +From 3f1ef0eeb7fe469bfc42e1ea6726ec91a97e165d Mon Sep 17 00:00:00 2001 +From: zhongtao +Date: Wed, 15 Feb 2023 16:05:39 +0800 +Subject: [PATCH 4/6] add cgroup resources json schema for isula update + +Signed-off-by: zhongtao +--- + .../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 0000000..1031071 +--- /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 05f55fc..f07d14f 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 6ed9473..ae77e9d 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 + diff --git a/0005-add-field-for-isulad-daemon-configs.patch b/0005-add-field-for-isulad-daemon-configs.patch new file mode 100644 index 0000000..6e07a7b --- /dev/null +++ b/0005-add-field-for-isulad-daemon-configs.patch @@ -0,0 +1,27 @@ +From 558723cf5f1506538822e716b5b9ae7ee84736f6 Mon Sep 17 00:00:00 2001 +From: "Neil.wrz" +Date: Wed, 15 Feb 2023 19:11:45 -0800 +Subject: [PATCH 5/6] add field for isulad daemon configs + +Signed-off-by: Neil.wrz +--- + 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 1332a73..b75e929 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 + diff --git a/0006-add-files_limit-to-oci-spec.patch b/0006-add-files_limit-to-oci-spec.patch new file mode 100644 index 0000000..de03a8c --- /dev/null +++ b/0006-add-files_limit-to-oci-spec.patch @@ -0,0 +1,37 @@ +From fe5de86ac3df1ba26f50f0eacdfb525e52f33573 Mon Sep 17 00:00:00 2001 +From: zhongtao +Date: Sat, 8 Apr 2023 11:38:50 +0800 +Subject: [PATCH 6/6] add files_limit to oci spec + +Signed-off-by: zhongtao +--- + src/json/schema/defs.json | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/src/json/schema/defs.json b/src/json/schema/defs.json +index 317cab4..27b2de2 100644 +--- a/src/json/schema/defs.json ++++ b/src/json/schema/defs.json +@@ -920,6 +920,19 @@ + "limit" + ] + }, ++ "files": { ++ "id": "https://opencontainers.org/schema/bundle/linux/resources/files", ++ "type": "object", ++ "properties": { ++ "limit": { ++ "id": "https://opencontainers.org/schema/bundle/linux/resources/files/limit", ++ "$ref": "#/definitions/int64" ++ } ++ }, ++ "required": [ ++ "limit" ++ ] ++ }, + "blockIO": { + "id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO", + "type": "object", +-- +2.25.1 + diff --git a/lcr.spec b/lcr.spec index 8700053..4a3c629 100644 --- a/lcr.spec +++ b/lcr.spec @@ -1,5 +1,5 @@ %global _version 2.0.9 -%global _release 3 +%global _release 4 %global _inner_name isula_libutils Name: lcr @@ -14,6 +14,10 @@ BuildRoot: %{_tmppath}/lcr-%{version} Patch0001: 0001-fix-update-cpu-rt-period-failed.patch Patch0002: 0002-fix-layer-size-type-as-int64.patch +Patch0003: 0003-adapt-to-repo-of-openeuler-url-changed.patch +Patch0004: 0004-add-cgroup-resources-json-schema-for-isula-update.patch +Patch0005: 0005-add-field-for-isulad-daemon-configs.patch +Patch0006: 0006-add-files_limit-to-oci-spec.patch %define lxcver_lower 4.0.3-2022102400 %define lxcver_upper 4.0.3-2022102500 @@ -109,6 +113,12 @@ rm -rf %{buildroot} %{_includedir}/%{_inner_name}/*.h %changelog +* Mon Apr 24 2023 zhangxiaoyu - 2.0.9-4 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:support update resources, remote-layer and files limit + * Tue Feb 21 2023 zhangxiaoyu - 2.0.9-3 - Type:bugfix - CVE:NA