Merge pull request #337 from mzain/fix-delete-logs

k8s-ci-robot · web-flow · commit 85e36527de6c · 2023-10-16T00:04:52.000+02:00
Fixed misleading delete logs. see issue #334
diff --git a/internal/objects/reconciler.go b/internal/objects/reconciler.go
@@ -585,7 +585,7 @@ func (r *Reconciler) operate(ctx context.Context, log logr.Logger, act syncActio
 }
 
 func (r *Reconciler) deleteObject(ctx context.Context, log logr.Logger, inst *unstructured.Unstructured) error {
-	log.Info("Deleted propagated object")
+
 	stats.WriteObject(r.GVK)
 	err := r.Delete(ctx, inst)
 	if errors.IsNotFound(err) {
@@ -598,6 +598,7 @@ func (r *Reconciler) deleteObject(ctx context.Context, log logr.Logger, inst *un
 		return err
 	}
 
+	log.Info("Deleted propagated object")
 	// Remove the propagated object from the map because we are confident that the object was successfully deleted
 	// on the apiserver.
 	r.recordRemovedObject(inst.GetNamespace(), inst.GetName())

Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,7 @@ func (r *Reconciler) operate(ctx context.Context, log logr.Logger, act syncActio`
`585`	`585`	`}`
`586`	`586`
`587`	`587`	`func (r Reconciler) deleteObject(ctx context.Context, log logr.Logger, inst unstructured.Unstructured) error {`
`588`		`- log.Info("Deleted propagated object")`
	`588`	`+`
`589`	`589`	`stats.WriteObject(r.GVK)`
`590`	`590`	`err := r.Delete(ctx, inst)`
`591`	`591`	`if errors.IsNotFound(err) {`
`@@ -598,6 +598,7 @@ func (r Reconciler) deleteObject(ctx context.Context, log logr.Logger, inst un`
`598`	`598`	`return err`
`599`	`599`	`}`
`600`	`600`
	`601`	`+ log.Info("Deleted propagated object")`
`601`	`602`	`// Remove the propagated object from the map because we are confident that the object was successfully deleted`
`602`	`603`	`// on the apiserver.`
`603`	`604`	`r.recordRemovedObject(inst.GetNamespace(), inst.GetName())`