From d9c2ece94a3b9309283815121d7a14ed46636063 Mon Sep 17 00:00:00 2001 From: Yash Mehrotra Date: Fri, 29 Dec 2023 02:52:26 +0530 Subject: [PATCH] fix: topology fetch id for jobs --- pkg/controllers/system_controller.go | 1 + pkg/jobs/topology/topology_jobs.go | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/controllers/system_controller.go b/pkg/controllers/system_controller.go index 920220527..0c1fceb48 100644 --- a/pkg/controllers/system_controller.go +++ b/pkg/controllers/system_controller.go @@ -74,6 +74,7 @@ func (r *TopologyReconciler) Reconcile(ctx gocontext.Context, req ctrl.Request) changed, err := db.PersistTopology(dCtx, topology) if err != nil { + logger.Error(err, "failed to persist topology", "id", topology.GetPersistedID(), "name", topology.GetName()) return ctrl.Result{}, err } diff --git a/pkg/jobs/topology/topology_jobs.go b/pkg/jobs/topology/topology_jobs.go index 00fbddcdb..6dc66bea7 100644 --- a/pkg/jobs/topology/topology_jobs.go +++ b/pkg/jobs/topology/topology_jobs.go @@ -6,6 +6,7 @@ import ( "sync" v1 "github.com/flanksource/canary-checker/api/v1" + "github.com/flanksource/canary-checker/pkg" "github.com/flanksource/canary-checker/pkg/db" pkgTopology "github.com/flanksource/canary-checker/pkg/topology" "github.com/flanksource/commons/logger" @@ -53,7 +54,7 @@ var SyncTopology = &job.Job{ Singleton: true, RunNow: true, Fn: func(ctx job.JobRuntime) error { - var topologies []v1.Topology + var topologies []pkg.Topology if err := ctx.DB().Table("topologies").Where(duty.LocalFilter). Find(&topologies).Error; err != nil { @@ -61,7 +62,7 @@ var SyncTopology = &job.Job{ } for _, topology := range topologies { - if err := SyncTopologyJob(ctx.Context, topology); err != nil { + if err := SyncTopologyJob(ctx.Context, topology.ToV1()); err != nil { ctx.History.AddError(err.Error()) } else { ctx.History.IncrSuccess()