Merge pull request #324 from weaveworks/fix-ports-order

Fix port discovery diff
fluxcd · Oct 5, 2019 · 5cdacf8 · 5cdacf8
2 parents 9a9baad + 2141d88
commit 5cdacf8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/charts/flagger/values.yaml b/charts/flagger/values.yaml
@@ -6,7 +6,9 @@ image:
   pullPolicy: IfNotPresent
   pullSecret:
 
-podAnnotations: {}
+podAnnotations:
+  prometheus.io/scrape: "true"
+  prometheus.io/port: "8080"
 
 metricsServer: "http://prometheus:9090"
 

diff --git a/kustomize/base/flagger/deployment.yaml b/kustomize/base/flagger/deployment.yaml
@@ -15,6 +15,7 @@ spec:
         app: flagger
       annotations:
         prometheus.io/scrape: "true"
+        prometheus.io/port: "8080"
     spec:
       serviceAccountName: flagger
       containers:

diff --git a/pkg/router/kubernetes.go b/pkg/router/kubernetes.go
@@ -3,6 +3,7 @@ package router
 import (
 	"fmt"
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 	flaggerv1 "github.com/weaveworks/flagger/pkg/apis/flagger/v1alpha3"
 	clientset "github.com/weaveworks/flagger/pkg/client/clientset/versioned"
 	"go.uber.org/zap"
@@ -128,7 +129,10 @@ func (c *KubernetesRouter) reconcileService(canary *flaggerv1.Canary, name strin
 	}
 
 	if svc != nil {
-		portsDiff := cmp.Diff(svcSpec.Ports, svc.Spec.Ports)
+		sortPorts := func(a, b interface{}) bool {
+			return a.(corev1.ServicePort).Port < b.(corev1.ServicePort).Port
+		}
+		portsDiff := cmp.Diff(svcSpec.Ports, svc.Spec.Ports, cmpopts.SortSlices(sortPorts))
 		selectorsDiff := cmp.Diff(svcSpec.Selector, svc.Spec.Selector)
 
 		if portsDiff != "" || selectorsDiff != "" {