core: (unorchestratedUpdates) update alert and throttling configs with other dynamic configs

tesla59 · tesla59 · commit db299d2c010f · 2024-09-25T17:31:38.000+05:30
Signed-off-by: tesla59 &lt;nishant@heim.id&gt;
diff --git a/KubeArmor/config/config.go b/KubeArmor/config/config.go
@@ -299,9 +299,6 @@ func LoadConfig() error {
 
 	GlobalCfg.StateAgent = viper.GetBool(ConfigStateAgent)
 
-	GlobalCfg.AlertThrottling = viper.GetBool(ConfigAlertThrottling)
-	GlobalCfg.MaxAlertPerSec = viper.GetInt(ConfigMaxAlertPerSec)
-	GlobalCfg.ThrottleSec = viper.GetInt(ConfigThrottleSec)
 	GlobalCfg.AnnotateResources = viper.GetBool(ConfigAnnotateResources)
 
 	LoadDynamicConfig()
@@ -331,4 +328,8 @@ func LoadDynamicConfig() {
 			GlobalCfg.HostVisibility = "none"
 		}
 	}
+
+	GlobalCfg.AlertThrottling = viper.GetBool(ConfigAlertThrottling)
+	GlobalCfg.MaxAlertPerSec = viper.GetInt(ConfigMaxAlertPerSec)
+	GlobalCfg.ThrottleSec = viper.GetInt(ConfigThrottleSec)
 }
diff --git a/KubeArmor/core/unorchestratedUpdates.go b/KubeArmor/core/unorchestratedUpdates.go
@@ -64,10 +64,6 @@ func (dm *KubeArmorDaemon) WatchConfigChanges() {
 			Capabilities: dm.validateVisibility("capabilities", cfg.GlobalCfg.Visibility),
 		}
 
-		// Log the current global posture and visibility
-		dm.Logger.Printf("Updating Global Posture to %v", globalPosture)
-		dm.Logger.Printf("Updating Visibility to %v", visibility)
-
 		// Apply the changes to the daemon
 		dm.UpdateGlobalPosture(globalPosture)
 
@@ -77,6 +73,9 @@ func (dm *KubeArmorDaemon) WatchConfigChanges() {
 			dm.UpdateDefaultPosture("MODIFIED", ep.NamespaceName, globalPosture, false)
 			dm.UpdateVisibility("MODIFIED", ep.NamespaceName, visibility)
 		}
+
+		// Update throttling configs
+		dm.SystemMonitor.UpdateThrottlingConfig()
 	})
 	viper.WatchConfig()
 }

Original file line number	Diff line number	Diff line change
`@@ -299,9 +299,6 @@ func LoadConfig() error {`
`299`	`299`
`300`	`300`	`GlobalCfg.StateAgent = viper.GetBool(ConfigStateAgent)`
`301`	`301`
`302`		`- GlobalCfg.AlertThrottling = viper.GetBool(ConfigAlertThrottling)`
`303`		`- GlobalCfg.MaxAlertPerSec = viper.GetInt(ConfigMaxAlertPerSec)`
`304`		`- GlobalCfg.ThrottleSec = viper.GetInt(ConfigThrottleSec)`
`305`	`302`	`GlobalCfg.AnnotateResources = viper.GetBool(ConfigAnnotateResources)`
`306`	`303`
`307`	`304`	`LoadDynamicConfig()`
`@@ -331,4 +328,8 @@ func LoadDynamicConfig() {`
`331`	`328`	`GlobalCfg.HostVisibility = "none"`
`332`	`329`	`}`
`333`	`330`	`}`
	`331`	`+`
	`332`	`+ GlobalCfg.AlertThrottling = viper.GetBool(ConfigAlertThrottling)`
	`333`	`+ GlobalCfg.MaxAlertPerSec = viper.GetInt(ConfigMaxAlertPerSec)`
	`334`	`+ GlobalCfg.ThrottleSec = viper.GetInt(ConfigThrottleSec)`
`334`	`335`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,10 +64,6 @@ func (dm *KubeArmorDaemon) WatchConfigChanges() {`
`64`	`64`	`Capabilities: dm.validateVisibility("capabilities", cfg.GlobalCfg.Visibility),`
`65`	`65`	`}`
`66`	`66`
`67`		`- // Log the current global posture and visibility`
`68`		`- dm.Logger.Printf("Updating Global Posture to %v", globalPosture)`
`69`		`- dm.Logger.Printf("Updating Visibility to %v", visibility)`
`70`		`-`
`71`	`67`	`// Apply the changes to the daemon`
`72`	`68`	`dm.UpdateGlobalPosture(globalPosture)`
`73`	`69`
`@@ -77,6 +73,9 @@ func (dm *KubeArmorDaemon) WatchConfigChanges() {`
`77`	`73`	`dm.UpdateDefaultPosture("MODIFIED", ep.NamespaceName, globalPosture, false)`
`78`	`74`	`dm.UpdateVisibility("MODIFIED", ep.NamespaceName, visibility)`
`79`	`75`	`}`
	`76`	`+`
	`77`	`+ // Update throttling configs`
	`78`	`+ dm.SystemMonitor.UpdateThrottlingConfig()`
`80`	`79`	`})`
`81`	`80`	`viper.WatchConfig()`
`82`	`81`	`}`