!60 [sync] PR-59: rubik: informer add nri support

From: @openeuler-sync-bot Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian
2024-08-22 06:08:03 +00:00 · 2024-08-22 06:08:03 +00:00 · 799ea7315e
commit 799ea7315e
parent dd4e16fcdb b532a09a6f
17 changed files with 191635 additions and 51 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-2.0.0-3
+2.0.0-6
--- a/2
+++ b/2
@ -1 +1 @@
-fdaef8a93069235bac826890a028f8fa7e7d1620
+0852f5182137b37c466e0e8d5b5f05dac3c3c509
--- a/patch/0001-Support-Labels-field-to-configure-QoSLevel.patch
+++ b/patch/0001-Support-Labels-field-to-configure-QoSLevel.patch
@ -1,7 +1,7 @@
-From b8e000527f7129242bd71f9c79697bef3a8b2111 Mon Sep 17 00:00:00 2001
+From aaa33596e0acb9e2ddb32bb888c15d86c242a388 Mon Sep 17 00:00:00 2001
 From: wujing <wujing50@huawei.com>
 Date: Wed, 10 May 2023 19:26:36 +0800
-Subject: [PATCH 1/7] Support Labels field to configure QoSLevel
+Subject: [PATCH 01/13] Support Labels field to configure QoSLevel

 Signed-off-by: wujing <wujing50@huawei.com>
 ---
@ -184,5 +184,5 @@ index 18cb0ec..8053c4b 100644
 	return fakePod
 }
 -- 
-2.32.1 (Apple Git-133)
+2.41.0

--- a/patch/0002-rubik-fix-weight-for-iocost-does-not-take-effect.patch
+++ b/patch/0002-rubik-fix-weight-for-iocost-does-not-take-effect.patch
@ -1,11 +1,8 @@
-From 804ff7873331cf745bc49aab5f5d2857ec1597c6 Mon Sep 17 00:00:00 2001
-From: hanchao <hanchao63@huawei.com>
-Date: Mon, 5 Jun 2023 13:56:01 +0800
-Subject: [PATCH 2/7] rubik: fix weight for iocost does not take effect
+From 347c81278ba63b6fe05476ad4dd9dd960b4b70a4 Mon Sep 17 00:00:00 2001
+From: vegbir <yangjiaqi16@huawei.com>
+Date: Tue, 20 Aug 2024 13:26:04 +0000
+Subject: [PATCH 02/13] rubik-fix-weight-for-iocost-does-not-take-effect

-reason: Fix weight for iocost does not take effect.
-The iocost weight is at pod level, not container
-level.
 ---
 pkg/services/iocost/iocost.go        | 7 +------
 pkg/services/iocost/iocost_origin.go | 8 ++++----
@ -13,11 +10,11 @@ level.
 3 files changed, 6 insertions(+), 11 deletions(-)

 diff --git a/pkg/services/iocost/iocost.go b/pkg/services/iocost/iocost.go
-index e5298b1..34f508a 100644
+index c11ef60..0f77edc 100644
 --- a/pkg/services/iocost/iocost.go
 +++ b/pkg/services/iocost/iocost.go
@@ -239,10 +239,5 @@ func (b *IOCost) configPodIOCostWeight(podInfo *typedef.PodInfo) error {
- 	if podInfo.Annotations[constant.PriorityAnnotationKey] == "false" {
+ 	if podInfo.Online() {
 		weight = onlineWeight
 	}
 -	for _, container := range podInfo.IDContainersMap {
@ -65,5 +62,5 @@ index 95b6d97..3bdadad 100644
 				assert.Contains(t, err.Error(), tt.errMsg)
 				return
 -- 
-2.32.1 (Apple Git-133)
+2.41.0

--- a/patch/0003-rubik-test-coverage-for-PSI-Manager.patch
+++ b/patch/0003-rubik-test-coverage-for-PSI-Manager.patch
@ -1,7 +1,7 @@
-From e7c89f1935d117a2778339cc4774393331002254 Mon Sep 17 00:00:00 2001
+From eaa82db55dbc543f9911e3c5ef4dd550711deb63 Mon Sep 17 00:00:00 2001
 From: jingxiaolu <lujingxiao@huawei.com>
 Date: Mon, 12 Jun 2023 23:12:37 +0800
-Subject: [PATCH 3/7] rubik: test coverage for PSI Manager
+Subject: [PATCH 03/13] rubik: test coverage for PSI Manager

 Adding test cases for PSI Manager

@ -260,5 +260,5 @@ index a6e0298..537d0b3 100644
 
 func TestErrorInitServiceComponents(t *testing.T) {
 -- 
-2.32.1 (Apple Git-133)
+2.41.0

--- a/patch/0004-rubik-add-psi-design-documentation.patch
+++ b/patch/0004-rubik-add-psi-design-documentation.patch
--- a/patch/0005-rubik-move-fssr-design-document-to-design-dir.patch
+++ b/patch/0005-rubik-move-fssr-design-document-to-design-dir.patch
@ -1,7 +1,7 @@
-From c74d87538bc27a20c24d27319c5d60970ab3ccab Mon Sep 17 00:00:00 2001
+From 780a5e80311f5f3d188666733dcf276abc8e7e81 Mon Sep 17 00:00:00 2001
 From: vegbir <yangjiaqi16@huawei.com>
 Date: Wed, 14 Jun 2023 17:14:16 +0800
-Subject: [PATCH 5/7] rubik: move fssr design document to design dir
+Subject: [PATCH 05/13] rubik: move fssr design document to design dir

 Signed-off-by: vegbir <yangjiaqi16@huawei.com>
 ---
@ -79,5 +79,5 @@ similarity index 100%
 rename from docs/png/rubik_fssr_1.png
 rename to docs/images/fssr/sequence_diagram.png
 -- 
-2.32.1 (Apple Git-133)
+2.41.0

--- a/patch/0006-rubik-fix-that-value-of-memory.high_async_ratio-lost.patch
+++ b/patch/0006-rubik-fix-that-value-of-memory.high_async_ratio-lost.patch
@ -1,7 +1,7 @@
-From 526bd12a3b77135ce5f112f3195f1e7d41d965d5 Mon Sep 17 00:00:00 2001
+From f7d9bc26368763d9c0bc9e7fc462dc0ab99a1784 Mon Sep 17 00:00:00 2001
 From: hanchao <hanchao63@huawei.com>
 Date: Fri, 16 Jun 2023 13:10:42 +0800
-Subject: [PATCH 6/7] rubik: fix that value of memory.high_async_ratio lost
+Subject: [PATCH 06/13] rubik: fix that value of memory.high_async_ratio lost
 efficacy

 ---
@ -242,5 +242,5 @@ index 9fe4042..e23a4bc 100644
 	if !util.PathExist(memInfoFile) {
 		return 0, fmt.Errorf("%v: no such file or diretory", memInfoFile)
 -- 
-2.32.1 (Apple Git-133)
+2.41.0

--- a/patch/0007-bugfix-fix-typos-calling-order-of-waitgroup.patch
+++ b/patch/0007-bugfix-fix-typos-calling-order-of-waitgroup.patch
@ -1,7 +1,7 @@
-From 6b9d862857a1b302b26d8d51e7df5fed3062ba94 Mon Sep 17 00:00:00 2001
+From 5d84595d50dc898b1c7307719cbd0807aff3fd99 Mon Sep 17 00:00:00 2001
 From: vegbir <yangjiaqi16@huawei.com>
 Date: Mon, 19 Jun 2023 11:47:53 +0800
-Subject: [PATCH 7/7] bugfix: fix typos & calling order of waitgroup
+Subject: [PATCH 07/13] bugfix: fix typos & calling order of waitgroup

 Signed-off-by: vegbir <yangjiaqi16@huawei.com>
 ---
@ -123,5 +123,5 @@ index 3e162b6..c3b252a 100644
 	}
 	wg.Wait()
 -- 
-2.32.1 (Apple Git-133)
+2.41.0

--- a/patch/0008-rubik-test-coverage-improvement-for-pkg-config.patch
+++ b/patch/0008-rubik-test-coverage-improvement-for-pkg-config.patch
@ -1,7 +1,7 @@
-From e30c428721ac2fd0da5152a28de04dbbf9c9d1ea Mon Sep 17 00:00:00 2001
+From 0403c7860be078ba67c5e05d7628411f72977d6b Mon Sep 17 00:00:00 2001
 From: jingxiaolu <lujingxiao@huawei.com>
 Date: Sun, 11 Jun 2023 22:34:08 +0800
-Subject: [PATCH 1/2] rubik: test coverage improvement for pkg/config
+Subject: [PATCH 08/13] rubik: test coverage improvement for pkg/config

 1. improve test coverage for pkg/config from 57.4% to 80.3%
 2. change cpuLimit to 1 in TestStatusStore_AddCgroup-TC5 for nano vm
@ -131,5 +131,5 @@ index 68c01c5..ce1684d 100644
 			fields: fields{
 				Config: &Config{
 -- 
-2.30.0
+2.41.0

--- a/patch/0009-rubik-optimize-dynamicAdjust-to-be-clear-and-add-log.patch
+++ b/patch/0009-rubik-optimize-dynamicAdjust-to-be-clear-and-add-log.patch
@ -1,7 +1,7 @@
-From 72dbcc6acf989f7c3423b24091c0b9875d1f4872 Mon Sep 17 00:00:00 2001
+From 3d63470cb0638f9b426f2060c260c45f27c36f04 Mon Sep 17 00:00:00 2001
 From: hanchao <hanchao63@huawei.com>
 Date: Mon, 19 Jun 2023 20:29:41 +0800
-Subject: [PATCH 2/2] rubik: optimize `dynamicAdjust` to be clear and add log
+Subject: [PATCH 09/13] rubik: optimize `dynamicAdjust` to be clear and add log
 for error

 ---
@ -61,5 +61,5 @@ index e23a4bc..2c81ccf 100644
 
 // adjustOfflinePodHighMemory adjusts the memory.high of offline pods.
 -- 
-2.30.0
+2.41.0

--- a/patch/0010-support-isulad-container-engine.patch
+++ b/patch/0010-support-isulad-container-engine.patch
@ -1,7 +1,7 @@
-From d704f38600a31138107460b7eba4a68a0b8362ea Mon Sep 17 00:00:00 2001
+From f2322711a03a998b34b54a5cc784c727f814cc96 Mon Sep 17 00:00:00 2001
 From: vegbir <yangjiaqi16@huawei.com>
 Date: Tue, 26 Sep 2023 17:05:06 +0800
-Subject: [PATCH] support isulad container engine
+Subject: [PATCH 10/13] support isulad container engine

 Signed-off-by: vegbir <yangjiaqi16@huawei.com>
 ---
@ -72,5 +72,5 @@ index 59dfb59..138c580 100644
 
 	cid := cont.status.ContainerID[len(currentContainerEngines.Prefix()):]
 -- 
-2.25.1
+2.41.0

--- a/patch/0011-support-systemd-cgroup-driver.patch
+++ b/patch/0011-support-systemd-cgroup-driver.patch
@ -1,7 +1,7 @@
-From f7cad7376bd823440df1f2f76c1d13cdfa8d4cbe Mon Sep 17 00:00:00 2001
+From 75075dbb1845e8714fa87ee0e19f80b8845dce71 Mon Sep 17 00:00:00 2001
 From: suoxiaocong <suoxiaocong@kylinos.cn>
 Date: Mon, 22 Apr 2024 15:52:03 +0800
-Subject: [PATCH] support systemd cgroup driver
+Subject: [PATCH 11/13] support systemd cgroup driver

 ---
 pkg/common/constant/constant.go   |  7 +++++++
@ -13,10 +13,10 @@ Subject: [PATCH] support systemd cgroup driver
 6 files changed, 71 insertions(+), 8 deletions(-)

 diff --git a/pkg/common/constant/constant.go b/pkg/common/constant/constant.go
-index 6a1f69d..cf780b8 100644
+index 2df0b81..4f22ef0 100644
 --- a/pkg/common/constant/constant.go
 +++ b/pkg/common/constant/constant.go
-@@ -113,3 +113,10 @@ const (
+@@ -111,3 +111,10 @@ const (
 	// PSIIOCgroupFileName is name of cgroup file used for detecting io psi
 	PSIIOCgroupFileName = "io.pressure"
 )
@ -28,7 +28,7 @@ index 6a1f69d..cf780b8 100644
 +	CgroupDriverCgroupfs = "cgroupfs"
 +)
 diff --git a/pkg/config/config.go b/pkg/config/config.go
-index e0caef3..b8d31a5 100644
+index 16ab6e1..6ae775f 100644
 --- a/pkg/config/config.go
 +++ b/pkg/config/config.go
@@ -44,6 +44,7 @@ type AgentConfig struct {
@ -58,7 +58,7 @@ index e0caef3..b8d31a5 100644
 	}
 	return c
 diff --git a/pkg/core/typedef/cgroup/common.go b/pkg/core/typedef/cgroup/common.go
-index 11002ab..668f951 100644
+index 8c0bd81..a952959 100644
 --- a/pkg/core/typedef/cgroup/common.go
 +++ b/pkg/core/typedef/cgroup/common.go
@@ -25,6 +25,17 @@ import (
@ -179,7 +179,7 @@ index 138c580..895e9d4 100644
 
 // ListRawContainers returns all RawContainers in the RawPod
 diff --git a/pkg/rubik/rubik.go b/pkg/rubik/rubik.go
-index f55e834..c4fc583 100644
+index 3864956..3595ff1 100644
 --- a/pkg/rubik/rubik.go
 +++ b/pkg/rubik/rubik.go
@@ -126,6 +126,9 @@ func runAgent(ctx context.Context) error {
@ -193,5 +193,5 @@ index f55e834..c4fc583 100644
 	// 4. init service components
 	services.InitServiceComponents(defaultRubikFeature)
 -- 
-2.25.1
+2.41.0

--- a/patch/0012-support-crio-container-engine.patch
+++ b/patch/0012-support-crio-container-engine.patch
@ -1,7 +1,7 @@
-From a6372125aa1327ab523a746d47cd17908763d27c Mon Sep 17 00:00:00 2001
+From 3741f7254be1a6766f7ca2056e689d6e84febb95 Mon Sep 17 00:00:00 2001
 From: weiyuan <weiyuan@kylinos.cn>
 Date: Tue, 21 May 2024 09:37:59 +0800
-Subject: [PATCH] support crio container engine
+Subject: [PATCH 12/13] support crio container engine

 ---
 pkg/core/typedef/containerinfo.go | 4 ++++
@ -37,5 +37,5 @@ index f751b25..845105f 100644
 )
 
 -- 
-2.39.2 (Apple Git-143)
+2.41.0

--- a/patch/0013-informer-add-nri-support.patch
+++ b/patch/0013-informer-add-nri-support.patch
--- a/rubik.spec
+++ b/rubik.spec
@ -1,6 +1,6 @@
 Name: rubik
 Version: 2.0.0
-Release: 5
+Release: 6
 Summary: Hybrid Deployment for Cloud Native
 License: Mulan PSL V2
 URL: https://gitee.com/openeuler/rubik
@ -56,6 +56,12 @@ install -Dp ./build_rubik_image.sh %{buildroot}%{_sharedstatedir}/%{name}/build_
 rm -rf %{buildroot}

 %changelog
+* Tue Aug 20 2024 vegbir <yangjiaqi16@huawei.com> - 2.0.0-6
+- Type: bugfix
+- CVE:NA
+- SUG:restart
+- DESC:informer add nri support
+
 * Tue May 21 2024 weiyuan <weiyuan@kylinos.cn> - 2.0.0-5
 - Type: bugfix
 - CVE:NA
--- a/series.conf
+++ b/series.conf
@ -10,4 +10,5 @@ patch/0009-rubik-optimize-dynamicAdjust-to-be-clear-and-add-log.patch
 patch/0010-support-isulad-container-engine.patch
 patch/0011-support-systemd-cgroup-driver.patch
 patch/0012-support-crio-container-engine.patch
+patch/0013-informer-add-nri-support.patch
 #end of file
 @ -1 +1 @@
 .0.0-3
 .0.0-6