From 8d37b7b20b069570bc651836d622a78f3e62ff78 Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Sat, 4 Apr 2020 10:00:00 +0300
Subject: [PATCH] Update service metadata if ownerRef kind is canary

---
 pkg/router/kubernetes_default.go | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkg/router/kubernetes_default.go b/pkg/router/kubernetes_default.go
index 8189c191..a9a2ee2a 100644
--- a/pkg/router/kubernetes_default.go
+++ b/pkg/router/kubernetes_default.go
@@ -194,21 +194,16 @@ func (c *KubernetesDefaultRouter) reconcileService(canary *flaggerv1.Canary, nam
 			updateService = true
 		}
 
-		// TODO: Handle annotation/label removal
-		annotationsDiff := cmp.Diff(metadata.Annotations, svc.ObjectMeta.Annotations)
-		if annotationsDiff != "" {
-			for k, v := range metadata.Annotations {
-				svcClone.ObjectMeta.Annotations[k] = v
+		// 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) != "" {
+				svcClone.ObjectMeta.Annotations = metadata.Annotations
+				updateService = true
 			}
-			updateService = true
-		}
-
-		labelsDiff := cmp.Diff(metadata.Labels, svc.ObjectMeta.Labels)
-		if labelsDiff != "" {
-			for k, v := range metadata.Labels {
-				svcClone.ObjectMeta.Labels[k] = v
+			if cmp.Diff(metadata.Labels, svc.ObjectMeta.Labels) != "" {
+				svcClone.ObjectMeta.Labels = metadata.Labels
+				updateService = true
 			}
-			updateService = true
 		}
 
 		if updateService {