Metrics service only target the default shard

rancher · Apr 23, 2024 · 436a81d · 436a81d
1 parent dceb784
commit 436a81d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/charts/fleet/templates/deployment.yaml b/charts/fleet/templates/deployment.yaml
@@ -16,6 +16,9 @@ spec:
       labels:
         app: fleet-controller
         shard: "{{ . }}"
+        {{- if empty . }}
+        shard-default: "true"
+        {{- end }}
     spec:
       containers:
       - env:

diff --git a/e2e/assets/metrics/fleetcontroller_service.yaml b/e2e/assets/metrics/fleetcontroller_service.yaml
@@ -5,6 +5,7 @@ metadata:
 spec:
   selector:
     app: fleet-controller
+    shard-default: "true"
   ports:
     - protocol: TCP
       port: {{ .Port }}

diff --git a/e2e/metrics/suite_test.go b/e2e/metrics/suite_test.go
@@ -28,24 +28,24 @@ var (
 )
 
 func setupLoadBalancer() {
-	rs := rand.NewSource(time.Now().UnixNano())
-	port := rs.Int63()%1000 + 30000
-	loadBalancerName = testenv.AddRandomSuffix("fleetcontroller", rs)
-
-	ks := k.Namespace("cattle-fleet-system")
-	err := testenv.ApplyTemplate(
-		ks,
-		testenv.AssetPath("metrics/fleetcontroller_service.yaml"),
-		map[string]interface{}{
-			"Name": loadBalancerName,
-			"Port": port,
-		},
-	)
-	Expect(err).ToNot(HaveOccurred())
-
 	if os.Getenv("METRICS_URL") != "" {
 		metricsURL = os.Getenv("METRICS_URL")
 	} else {
+		rs := rand.NewSource(time.Now().UnixNano())
+		port := rs.Int63()%1000 + 30000
+		loadBalancerName = testenv.AddRandomSuffix("fleetcontroller", rs)
+
+		ks := k.Namespace("cattle-fleet-system")
+		err := testenv.ApplyTemplate(
+			ks,
+			testenv.AssetPath("metrics/fleetcontroller_service.yaml"),
+			map[string]interface{}{
+				"Name": loadBalancerName,
+				"Port": port,
+			},
+		)
+		Expect(err).ToNot(HaveOccurred())
+
 		Eventually(func() (string, error) {
 			ip, err := ks.Get(
 				"service", loadBalancerName,