merge main

Signed-off-by: ShutingZhao <[email protected]>
realshuting · Aug 9, 2024 · 44f0656 · 44f0656
1 parent 7f58311
commit 44f0656
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/pkg/background/generate/generate.go b/pkg/background/generate/generate.go
@@ -92,11 +92,7 @@ func NewGenerateController(
 }
 
 func (c *GenerateController) ProcessUR(ur *kyvernov2.UpdateRequest) error {
-<<<<<<< HEAD
 	logger := c.log.WithValues("name", ur.GetName(), "policy", ur.Spec.GetPolicyKey())
-=======
-	logger := c.log.WithValues("name", ur.GetName(), "policy", ur.Spec.GetPolicyKey(), "rule", ur.Spec.GetRuleName(), "resource", ur.Spec.GetResource().String())
->>>>>>> main
 	var err error
 	var genResources []kyvernov1.ResourceSpec
 	logger.Info("start processing UR", "ur", ur.Name, "resourceVersion", ur.GetResourceVersion())