Merge pull request #1266 from Prateeknandle/fix-owner

handling empty owner field
kubearmor · Jun 13, 2023 · 1346451 · 1346451
2 parents c2f09c7 + 7f767ba
commit 1346451
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/KubeArmor/feeder/feeder.go b/KubeArmor/feeder/feeder.go
@@ -602,17 +602,17 @@ func (fd *Feeder) PushLog(log tp.Log) {
 
 		pbAlert.NamespaceName = log.NamespaceName
 
-		var o *pb.Podowner
-		if log.Owner != nil {
-			o = &pb.Podowner{
+		var owner *pb.Podowner
+		if log.Owner != nil && (log.Owner.Ref != "" || log.Owner.Name != "" || log.Owner.Namespace != "") {
+			owner = &pb.Podowner{
 				Ref:       log.Owner.Ref,
 				Name:      log.Owner.Name,
 				Namespace: log.Owner.Namespace,
 			}
 		}
 
-		if pbAlert.Owner == nil {
-			pbAlert.Owner = o
+		if pbAlert.Owner == nil && owner != nil {
+			pbAlert.Owner = owner
 		}
 
 		pbAlert.PodName = log.PodName
@@ -688,17 +688,17 @@ func (fd *Feeder) PushLog(log tp.Log) {
 
 		pbLog.NamespaceName = log.NamespaceName
 
-		var o *pb.Podowner
-		if log.Owner != nil {
-			o = &pb.Podowner{
+		var owner *pb.Podowner
+		if log.Owner != nil && (log.Owner.Ref != "" || log.Owner.Name != "" || log.Owner.Namespace != "") {
+			owner = &pb.Podowner{
 				Ref:       log.Owner.Ref,
 				Name:      log.Owner.Name,
 				Namespace: log.Owner.Namespace,
 			}
 		}
 
-		if pbLog.Owner == nil {
-			pbLog.Owner = o
+		if pbLog.Owner == nil && owner != nil {
+			pbLog.Owner = owner
 		}
 
 		pbLog.PodName = log.PodName