diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go index fd494f17..b6990df9 100644 --- a/pkg/controller/controller.go +++ b/pkg/controller/controller.go @@ -248,17 +248,17 @@ func checkCustomResourceType(obj interface{}, logger *zap.SugaredLogger) (flagge } func (c *Controller) recordEventInfof(r *flaggerv1.Canary, template string, args ...interface{}) { - c.logger.Infof(template, args...) + c.logger.With("canary", fmt.Sprintf("%s.%s", r.Name, r.Namespace)).Infof(template, args...) c.eventRecorder.Event(r, corev1.EventTypeNormal, "Synced", fmt.Sprintf(template, args...)) } func (c *Controller) recordEventErrorf(r *flaggerv1.Canary, template string, args ...interface{}) { - c.logger.Errorf(template, args...) + c.logger.With("canary", fmt.Sprintf("%s.%s", r.Name, r.Namespace)).Errorf(template, args...) c.eventRecorder.Event(r, corev1.EventTypeWarning, "Synced", fmt.Sprintf(template, args...)) } func (c *Controller) recordEventWarningf(r *flaggerv1.Canary, template string, args ...interface{}) { - c.logger.Infof(template, args...) + c.logger.With("canary", fmt.Sprintf("%s.%s", r.Name, r.Namespace)).Infof(template, args...) c.eventRecorder.Event(r, corev1.EventTypeWarning, "Synced", fmt.Sprintf(template, args...)) } diff --git a/pkg/controller/deployer.go b/pkg/controller/deployer.go index e2fac6a8..a5d65a3e 100644 --- a/pkg/controller/deployer.go +++ b/pkg/controller/deployer.go @@ -266,7 +266,7 @@ func (c *CanaryDeployer) Sync(cd *flaggerv1.Canary) error { } if cd.Status.Phase == "" { - c.logger.Infof("Scaling down %s.%s", cd.Spec.TargetRef.Name, cd.Namespace) + c.logger.With("canary", fmt.Sprintf("%s.%s", cd.Name, cd.Namespace)).Infof("Scaling down %s.%s", cd.Spec.TargetRef.Name, cd.Namespace) if err := c.Scale(cd, 0); err != nil { return err } @@ -333,7 +333,7 @@ func (c *CanaryDeployer) createPrimaryDeployment(cd *flaggerv1.Canary) error { return err } - c.logger.Infof("Deployment %s.%s created", primaryDep.GetName(), cd.Namespace) + c.logger.With("canary", fmt.Sprintf("%s.%s", cd.Name, cd.Namespace)).Infof("Deployment %s.%s created", primaryDep.GetName(), cd.Namespace) } return nil @@ -381,7 +381,7 @@ func (c *CanaryDeployer) createPrimaryHpa(cd *flaggerv1.Canary) error { if err != nil { return err } - c.logger.Infof("HorizontalPodAutoscaler %s.%s created", primaryHpa.GetName(), cd.Namespace) + c.logger.With("canary", fmt.Sprintf("%s.%s", cd.Name, cd.Namespace)).Infof("HorizontalPodAutoscaler %s.%s created", primaryHpa.GetName(), cd.Namespace) } return nil diff --git a/pkg/controller/router.go b/pkg/controller/router.go index f01594b9..2c5e130f 100644 --- a/pkg/controller/router.go +++ b/pkg/controller/router.go @@ -79,7 +79,7 @@ func (c *CanaryRouter) createServices(cd *flaggerv1.Canary) error { if err != nil { return err } - c.logger.Infof("Service %s.%s created", canaryService.GetName(), cd.Namespace) + c.logger.With("canary", fmt.Sprintf("%s.%s", cd.Name, cd.Namespace)).Infof("Service %s.%s created", canaryService.GetName(), cd.Namespace) } canaryTestServiceName := fmt.Sprintf("%s-canary", cd.Spec.TargetRef.Name) @@ -118,7 +118,7 @@ func (c *CanaryRouter) createServices(cd *flaggerv1.Canary) error { if err != nil { return err } - c.logger.Infof("Service %s.%s created", canaryTestService.GetName(), cd.Namespace) + c.logger.With("canary", fmt.Sprintf("%s.%s", cd.Name, cd.Namespace)).Infof("Service %s.%s created", canaryTestService.GetName(), cd.Namespace) } primaryService, err := c.kubeClient.CoreV1().Services(cd.Namespace).Get(primaryName, metav1.GetOptions{}) @@ -157,7 +157,7 @@ func (c *CanaryRouter) createServices(cd *flaggerv1.Canary) error { return err } - c.logger.Infof("Service %s.%s created", primaryService.GetName(), cd.Namespace) + c.logger.With("canary", fmt.Sprintf("%s.%s", cd.Name, cd.Namespace)).Infof("Service %s.%s created", primaryService.GetName(), cd.Namespace) } return nil @@ -218,7 +218,7 @@ func (c *CanaryRouter) createVirtualService(cd *flaggerv1.Canary) error { if err != nil { return fmt.Errorf("VirtualService %s.%s create error %v", targetName, cd.Namespace, err) } - c.logger.Infof("VirtualService %s.%s created", virtualService.GetName(), cd.Namespace) + c.logger.With("canary", fmt.Sprintf("%s.%s", cd.Name, cd.Namespace)).Infof("VirtualService %s.%s created", virtualService.GetName(), cd.Namespace) } return nil diff --git a/pkg/controller/scheduler.go b/pkg/controller/scheduler.go index 17cf2e96..f6975df3 100644 --- a/pkg/controller/scheduler.go +++ b/pkg/controller/scheduler.go @@ -75,7 +75,7 @@ func (c *Controller) advanceCanary(name string, namespace string) { // check if the canary exists cd, err := c.flaggerClient.FlaggerV1alpha3().Canaries(namespace).Get(name, v1.GetOptions{}) if err != nil { - c.logger.Errorf("Canary %s.%s not found", name, namespace) + c.logger.With("canary", fmt.Sprintf("%s.%s", name, namespace)).Errorf("Canary %s.%s not found", name, namespace) return } @@ -174,7 +174,7 @@ func (c *Controller) advanceCanary(name string, namespace string) { // mark canary as failed if err := c.deployer.SyncStatus(cd, flaggerv1.CanaryStatus{Phase: flaggerv1.CanaryFailed, CanaryWeight: 0}); err != nil { - c.logger.Errorf("%v", err) + c.logger.With("canary", fmt.Sprintf("%s.%s", cd.Name, cd.Namespace)).Errorf("%v", err) return } @@ -268,7 +268,7 @@ func (c *Controller) checkCanaryStatus(cd *flaggerv1.Canary, deployer CanaryDepl if cd.Status.Phase == "" { if err := deployer.SyncStatus(cd, flaggerv1.CanaryStatus{Phase: flaggerv1.CanaryInitialized}); err != nil { - c.logger.Errorf("%v", err) + c.logger.With("canary", fmt.Sprintf("%s.%s", cd.Name, cd.Namespace)).Errorf("%v", err) return false } c.recorder.SetStatus(cd) @@ -287,7 +287,7 @@ func (c *Controller) checkCanaryStatus(cd *flaggerv1.Canary, deployer CanaryDepl return false } if err := deployer.SyncStatus(cd, flaggerv1.CanaryStatus{Phase: flaggerv1.CanaryProgressing}); err != nil { - c.logger.Errorf("%v", err) + c.logger.With("canary", fmt.Sprintf("%s.%s", cd.Name, cd.Namespace)).Errorf("%v", err) return false } c.recorder.SetStatus(cd)