From 52c757250a84a5e08f07732df6151dbb3f85b3d7 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Fri, 8 May 2020 13:14:50 +0300 Subject: [PATCH] Fix annotations diff --- pkg/router/kubernetes_default.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/router/kubernetes_default.go b/pkg/router/kubernetes_default.go index a8d4a9c9..614f79aa 100644 --- a/pkg/router/kubernetes_default.go +++ b/pkg/router/kubernetes_default.go @@ -181,7 +181,6 @@ func (c *KubernetesDefaultRouter) reconcileService(canary *flaggerv1.Canary, nam portsDiff := cmp.Diff(svcSpec.Ports, svc.Spec.Ports, cmpopts.SortSlices(sortPorts)) selectorsDiff := cmp.Diff(svcSpec.Selector, svc.Spec.Selector) - if portsDiff != "" || selectorsDiff != "" { svcClone.Spec.Ports = svcSpec.Ports svcClone.Spec.Selector = svcSpec.Selector @@ -191,11 +190,14 @@ func (c *KubernetesDefaultRouter) reconcileService(canary *flaggerv1.Canary, nam // update annotations and labels only if the service has been created by Flagger if _, owned := c.isOwnedByCanary(svc, canary.Name); owned { - if cmp.Diff(metadata.Annotations, svc.ObjectMeta.Annotations) != "" { + if svc.ObjectMeta.Annotations == nil { + svc.ObjectMeta.Annotations = make(map[string]string) + } + if diff := cmp.Diff(metadata.Annotations, svc.ObjectMeta.Annotations); diff != "" { svcClone.ObjectMeta.Annotations = metadata.Annotations updateService = true } - if cmp.Diff(metadata.Labels, svc.ObjectMeta.Labels) != "" { + if diff := cmp.Diff(metadata.Labels, svc.ObjectMeta.Labels); diff != "" { svcClone.ObjectMeta.Labels = metadata.Labels updateService = true }