From 7ef5e13f671ded4fdfd0ddf5e8a1cbcddf083717 Mon Sep 17 00:00:00 2001 From: ianlee Date: Mon, 18 Mar 2024 20:08:36 +0900 Subject: [PATCH] add log print to reconcile --- pkg/controllers/components.go | 8 ++++---- pkg/controllers/deployment_updater.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/controllers/components.go b/pkg/controllers/components.go index b6c14014..b160b694 100644 --- a/pkg/controllers/components.go +++ b/pkg/controllers/components.go @@ -389,24 +389,24 @@ func (c MilvusComponent) GetDependencies(spec v1beta1.MilvusSpec) []MilvusCompon } // IsImageUpdated returns whether the image of the component is updated -func (c MilvusComponent) IsImageUpdated(m *v1beta1.Milvus) bool { +func (c MilvusComponent) IsImageUpdated(m *v1beta1.Milvus, mc MilvusComponent) bool { //Done: ctx, cancel := context.WithCancel(context.Background()) defer cancel() logger := ctrl.LoggerFrom(ctx) - logger.Info("IsImageUpdated", "ComponentsDeployStatus", len(m.Status.ComponentsDeployStatus), "name", c.GetName(), "component", m.Status.Endpoint, "component", m.Spec) + logger.Info("IsImageUpdated", "ComponentsDeployStatus", len(m.Status.ComponentsDeployStatus), "name", c.GetName(), "component", mc.Name) if m.Status.ComponentsDeployStatus == nil { return false } deployStatus := m.Status.ComponentsDeployStatus[c.GetName()] - logger.Info("IsImageUpdated", "m.Spec.Com.Image", m.Spec.Com.Image, "deployStatus.Image", deployStatus.Image, "name", c.GetName(), "component", m.Status.Endpoint, "component", m.Spec) + logger.Info("IsImageUpdated", "m.Spec.Com.Image", m.Spec.Com.Image, "deployStatus.Image", deployStatus.Image, "name", c.GetName(), "component", mc.Name) if m.Spec.Com.Image != deployStatus.Image { return false } - logger.Info("IsImageUpdated", "deployStatus.GetState()", deployStatus.GetState(), "name", c.GetName(), "component", m.Status.Endpoint, "component", m.Spec) + logger.Info("IsImageUpdated", "deployStatus.GetState()", deployStatus.GetState(), "name", c.GetName(), "component", m.Status.Endpoint, "component", mc.Name) if deployStatus.GetState() != v1beta1.DeploymentComplete { return false } diff --git a/pkg/controllers/deployment_updater.go b/pkg/controllers/deployment_updater.go index 77504ede..bf9270eb 100644 --- a/pkg/controllers/deployment_updater.go +++ b/pkg/controllers/deployment_updater.go @@ -413,7 +413,7 @@ func (m milvusDeploymentUpdater) RollingUpdateImageDependencyReady() bool { for _, dep := range deps { logger.Info("RollingUpdateImageDependencyReady", "dep", fmt.Sprintf("%s:%s", dep.Name, dep.FieldName), "component", m.component) - if !dep.IsImageUpdated(m.GetMilvus()) { + if !dep.IsImageUpdated(m.GetMilvus(), m.component) { return false } }