Rename sharding labels

rancher · May 27, 2024 · cc12b3b · cc12b3b
1 parent bf3bffc
commit cc12b3b
Show file tree

Hide file tree

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

diff --git a/charts/fleet/templates/service.yaml b/charts/fleet/templates/service.yaml
@@ -20,9 +20,9 @@ spec:
   selector:
     app: fleet-controller
     {{- if empty . }}
-    shard-default: "true"
+    fleet.cattle.io/shard-default: "true"
     {{- else }}
-    shard: "{{ . }}"
+    fleet.cattle.io/shard-id: "{{ . }}"
     {{- end }}
 ---
 {{- end }}

diff --git a/e2e/assets/gitrepo-template.yaml b/e2e/assets/gitrepo-template.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ .Name }}
   {{- if ne .Shard "" }}
   labels:
-    fleet.cattle.io/shard: {{ .Shard }}
+    fleet.cattle.io/shard-ref: {{ .Shard }}
   {{- end }}
 
 spec:

diff --git a/e2e/assets/gitrepo/gitrepo_sharded.yaml b/e2e/assets/gitrepo/gitrepo_sharded.yaml
@@ -3,7 +3,7 @@ apiVersion: fleet.cattle.io/v1alpha1
 metadata:
   name: {{.Name}}
   labels:
-    fleet.cattle.io/shard: {{.ShardID}}
+    fleet.cattle.io/shard-ref: {{.ShardID}}
 spec:
   repo: {{.Repo}}
   branch: {{.Branch}}

diff --git a/e2e/assets/metrics/fleetcontroller_service.yaml b/e2e/assets/metrics/fleetcontroller_service.yaml
@@ -9,9 +9,9 @@ spec:
   selector:
     app: fleet-controller
     {{- if .IsDefaultShard }}
-    shard-default: "{{ .IsDefaultShard }}"
+    fleet.cattle.io/shard-default: "{{ .IsDefaultShard }}"
     {{ else }}
-    shard: {{ .Shard }}
+    fleet.cattle.io/shard-id: {{ .Shard }}
     {{- end }}
   ports:
     - protocol: TCP

diff --git a/e2e/single-cluster/imagescan_test.go b/e2e/single-cluster/imagescan_test.go
@@ -189,7 +189,7 @@ var _ = Describe("Image Scan dynamic tests pushing to ttl.sh", Label("infra-setu
 })
 
 func getFleetControllerRestarts(k kubectl.Command, index int) int {
-	out, err := k.Namespace("cattle-fleet-system").Get("pods", "-l", "app=fleet-controller", "-l", "shard=",
+	out, err := k.Namespace("cattle-fleet-system").Get("pods", "-l", "app=fleet-controller", "-l", "fleet.cattle.io/shard-id=",
 		"--no-headers",
 		"-o", fmt.Sprintf("custom-columns=RESTARTS:.status.containerStatuses[%d].restartCount", index))
 	Expect(err).NotTo(HaveOccurred())
@@ -200,7 +200,7 @@ func getFleetControllerRestarts(k kubectl.Command, index int) int {
 }
 
 func getFleetControllerReady(k kubectl.Command, index int) bool {
-	out, err := k.Namespace("cattle-fleet-system").Get("pods", "-l", "app=fleet-controller", "-l", "shard=",
+	out, err := k.Namespace("cattle-fleet-system").Get("pods", "-l", "app=fleet-controller", "-l", "fleet.cattle.io/shard-id=",
 		"--no-headers",
 		"-o", fmt.Sprintf("custom-columns=RESTARTS:.status.containerStatuses[%d].ready", index))
 	Expect(err).NotTo(HaveOccurred())
@@ -214,7 +214,7 @@ func getFleetControllerContainerIndexInPod(k kubectl.Command, container string)
 	// the fleet controller pod runs 3 containers.
 	// we need to know the index of the fleet-controller container inside the pod.
 	// get all the container names, and return the index of the given container name
-	out, err := k.Namespace("cattle-fleet-system").Get("pods", "-l", "app=fleet-controller", "-l", "shard=",
+	out, err := k.Namespace("cattle-fleet-system").Get("pods", "-l", "app=fleet-controller", "-l", "fleet.cattle.io/shard-id=",
 		"--no-headers", "-o", "custom-columns=RESTARTS:.status.containerStatuses[*].name")
 	Expect(err).NotTo(HaveOccurred())
 	out = strings.TrimSuffix(out, "\n")

diff --git a/e2e/single-cluster/sharding_test.go b/e2e/single-cluster/sharding_test.go
@@ -28,7 +28,7 @@ var _ = Describe("Filtering events by shard", Label("sharding"), Ordered, func()
 				"-l",
 				"app=fleet-controller",
 				"-l",
-				fmt.Sprintf("shard=%s", shard),
+				fmt.Sprintf("fleet.cattle.io/shard-id=%s", shard),
 				"--tail=-1",
 			)
 			Expect(err).ToNot(HaveOccurred())
@@ -82,7 +82,7 @@ var _ = Describe("Filtering events by shard", Label("sharding"), Ordered, func()
 							"-l",
 							"app=fleet-controller",
 							"-l",
-							fmt.Sprintf("shard=%s", s),
+							fmt.Sprintf("fleet.cattle.io/shard-id=%s", s),
 							"--tail=100",
 						)
 						g.Expect(err).ToNot(HaveOccurred())
@@ -154,7 +154,7 @@ var _ = Describe("Filtering events by shard", Label("sharding"), Ordered, func()
 					"-l",
 					"app=fleet-controller",
 					"-l",
-					fmt.Sprintf("shard=%s", s),
+					fmt.Sprintf("fleet.cattle.io/shard-id=%s", s),
 					"--tail=100",
 				)
 				Expect(err).ToNot(HaveOccurred())

diff --git a/pkg/sharding/sharding.go b/pkg/sharding/sharding.go
@@ -6,11 +6,18 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 )
 
-const ShardingLabel string = "fleet.cattle.io/shard"
+const (
+	// ShardingIDLabel is the label key used to identify the shard ID of a controller pod
+	ShardingIDLabel string = "fleet.cattle.io/shard-id"
+	// ShardingRefLabel is the label key used by resources to reference the shard ID of a controller
+	ShardingRefLabel string = "fleet.cattle.io/shard-ref"
+	// ShardingDefaultLabel is the label key which is set to true on the controller handling unlabeled resources
+	ShardingDefaultLabel string = "fleet.cattle.io/shard-default"
+)
 
 func FilterByShardID(shardID string) predicate.Funcs {
 	matchesLabel := func(o client.Object) bool {
-		label, hasLabel := o.GetLabels()[ShardingLabel]
+		label, hasLabel := o.GetLabels()[ShardingIDLabel]
 
 		if shardID == "" {
 			return !hasLabel