add enable pod events field and Add oomkilled field in inspect.json

Signed-off-by: zhongtao <zhongtao17@huawei.com>
(cherry picked from commit 4b38add1e34192a04b51b54c65b55c4815b622c6)
This commit is contained in:
zhongtao 2024-03-30 15:28:25 +08:00 committed by openeuler-sync-bot
parent 9af388c641
commit 8175af214d
3 changed files with 63 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From 19655a5df138acda0a57b0411bc69f82511a32b4 Mon Sep 17 00:00:00 2001
From: jikai <jikai11@huawei.com>
Date: Wed, 13 Mar 2024 15:21:09 +0800
Subject: [PATCH 4/5] add enable pod events field
Signed-off-by: jikai <jikai11@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 46cf9e2..bbacfd6 100644
--- a/src/json/schema/isulad-daemon-configs.json
+++ b/src/json/schema/isulad-daemon-configs.json
@@ -176,6 +176,9 @@
},
"systemd-cgroup": {
"type": "boolean"
+ },
+ "enable-pod-events": {
+ "type": "boolean"
}
}
}
--
2.25.1

View File

@ -0,0 +1,27 @@
From 5adb5c82cb48f55fec1d6750e0648a0ffc5a372c Mon Sep 17 00:00:00 2001
From: jikai <jikai11@huawei.com>
Date: Mon, 18 Mar 2024 20:23:58 +0800
Subject: [PATCH 5/5] Add oomkilled field in inspect.json
Signed-off-by: jikai <jikai11@huawei.com>
---
src/json/schema/container/inspect.json | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/json/schema/container/inspect.json b/src/json/schema/container/inspect.json
index 9c76c33..89cb871 100644
--- a/src/json/schema/container/inspect.json
+++ b/src/json/schema/container/inspect.json
@@ -34,6 +34,9 @@
"Restarting": {
"type": "boolean"
},
+ "OOMKilled": {
+ "type": "boolean"
+ },
"Pid": {
"type": "integer"
},
--
2.25.1

View File

@ -1,5 +1,5 @@
%global _version 2.1.4 %global _version 2.1.4
%global _release 3 %global _release 4
%global _inner_name isula_libutils %global _inner_name isula_libutils
%global enable_lxc 1 %global enable_lxc 1
@ -16,6 +16,8 @@ BuildRoot: %{_tmppath}/lcr-%{version}
Patch0001: 0001-add-systemd-cgroup-field-in-isulad-and-shim-config.patch Patch0001: 0001-add-systemd-cgroup-field-in-isulad-and-shim-config.patch
Patch0002: 0002-Add-http-parser-as-third-party-component.patch Patch0002: 0002-Add-http-parser-as-third-party-component.patch
Patch0003: 0003-add-swap-usage-fields-in-shim-stats-and-container-in.patch Patch0003: 0003-add-swap-usage-fields-in-shim-stats-and-container-in.patch
Patch0004: 0004-add-enable-pod-events-field.patch
Patch0005: 0005-Add-oomkilled-field-in-inspect.json.patch
%define lxcver_lower 4.0.3-2022102400 %define lxcver_lower 4.0.3-2022102400
%define lxcver_upper 5.0.3 %define lxcver_upper 5.0.3
@ -132,6 +134,12 @@ rm -rf %{buildroot}
%{_includedir}/lcr/utils_compile.h %{_includedir}/lcr/utils_compile.h
%changelog %changelog
* Sat Mar 30 2024 zhongtao<zhongtao17@huawei.com> - 2.1.4-4
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:add enable pod events field and Add oomkilled field in inspect.json
* Wed Mar 20 2024 jikai<jikai11@huawei.com> - 2.1.4-3 * Wed Mar 20 2024 jikai<jikai11@huawei.com> - 2.1.4-3
- Type:bugfix - Type:bugfix
- CVE:NA - CVE:NA