From 9efb8330acb251c176794340150969c3275a6a09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20N=C3=A9au?= Date: Mon, 30 Sep 2024 12:37:07 +0200 Subject: [PATCH] Limit `Deployed bundle` logs This prevents a log message from being produced even when a bundle deployment and its Helm release were already installed in their latest available versions. --- internal/cmd/agent/deployer/deployer.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/internal/cmd/agent/deployer/deployer.go b/internal/cmd/agent/deployer/deployer.go index 087b267984..f1044acd83 100644 --- a/internal/cmd/agent/deployer/deployer.go +++ b/internal/cmd/agent/deployer/deployer.go @@ -16,6 +16,7 @@ import ( "github.com/rancher/wrangler/v3/pkg/condition" "github.com/rancher/wrangler/v3/pkg/kv" + "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" @@ -62,7 +63,7 @@ func (d *Deployer) DeployBundle(ctx context.Context, bd *fleet.BundleDeployment) return status, err } - release, err := d.helmdeploy(ctx, bd) + release, err := d.helmdeploy(ctx, logger, bd) if err != nil { // When an error from DeployBundle is returned it causes DeployBundle // to requeue and keep trying to deploy on a loop. If there is something @@ -85,7 +86,6 @@ func (d *Deployer) DeployBundle(ctx context.Context, bd *fleet.BundleDeployment) } status.Release = release status.AppliedDeploymentID = bd.Spec.DeploymentID - logger.Info("Deployed bundle", "release", release, "appliedDeploymentID", status.AppliedDeploymentID) if err := d.setNamespaceLabelsAndAnnotations(ctx, bd, release); err != nil { return fleet.BundleDeploymentStatus{}, err @@ -98,7 +98,7 @@ func (d *Deployer) DeployBundle(ctx context.Context, bd *fleet.BundleDeployment) // Deploy the bundle deployment, i.e. with helmdeployer. // This loads the manifest and the contents from the upstream cluster. -func (d *Deployer) helmdeploy(ctx context.Context, bd *fleet.BundleDeployment) (string, error) { +func (d *Deployer) helmdeploy(ctx context.Context, logger logr.Logger, bd *fleet.BundleDeployment) (string, error) { if bd.Spec.DeploymentID == bd.Status.AppliedDeploymentID { if ok, err := d.helm.EnsureInstalled(bd.Name, bd.Status.Release); err != nil { return "", err @@ -157,6 +157,8 @@ func (d *Deployer) helmdeploy(ctx context.Context, bd *fleet.BundleDeployment) ( return "", err } + logger.Info("Deployed bundle", "release", resource.ID, "DeploymentID", bd.Spec.DeploymentID) + return resource.ID, nil }