add MastodonServer's name to selector

ushitora-anqou · Sep 12, 2024 · 92d8b01 · 92d8b01
1 parent 3df96c2
commit 92d8b01
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/charts/magout-mastodon-server/templates/gateway.yaml b/charts/magout-mastodon-server/templates/gateway.yaml
@@ -9,12 +9,14 @@ spec:
       app.kubernetes.io/name: nginx
       app.kubernetes.io/component: gateway
       app.kubernetes.io/part-of: mastodon
+      magout.anqou.net/mastodon-server: {{ include "magout-mastodon-server.fullname" . }}
   template:
     metadata:
       labels:
         app.kubernetes.io/name: nginx
         app.kubernetes.io/component: gateway
         app.kubernetes.io/part-of: mastodon
+        magout.anqou.net/mastodon-server: {{ include "magout-mastodon-server.fullname" . }}
     spec:
       initContainers:
         - name: copy-assets

diff --git a/charts/magout-mastodon-server/templates/service.yaml b/charts/magout-mastodon-server/templates/service.yaml
@@ -14,6 +14,7 @@ spec:
     app.kubernetes.io/name: puma
     app.kubernetes.io/component: web
     app.kubernetes.io/part-of: mastodon
+    magout.anqou.net/mastodon-server: {{ include "magout-mastodon-server.fullname" . }}
 ---
 apiVersion: v1
 kind: Service
@@ -31,3 +32,4 @@ spec:
     app.kubernetes.io/name: node
     app.kubernetes.io/component: streaming
     app.kubernetes.io/part-of: mastodon
+    magout.anqou.net/mastodon-server: {{ include "magout-mastodon-server.fullname" . }}
diff --git a/internal/controller/mastodonserver_controller.go b/internal/controller/mastodonserver_controller.go
@@ -605,9 +605,10 @@ func (r *MastodonServerReconciler) createOrUpdateDeployment(
 		}
 
 		selector := map[string]string{
-			"app.kubernetes.io/name":      appName,
-			"app.kubernetes.io/component": string(component),
-			"app.kubernetes.io/part-of":   "mastodon",
+			"app.kubernetes.io/name":           appName,
+			"app.kubernetes.io/component":      string(component),
+			"app.kubernetes.io/part-of":        "mastodon",
+			"magout.anqou.net/mastodon-server": server.GetName(),
 		}
 		deploy.Spec.Selector = &metav1.LabelSelector{
 			MatchLabels: selector,

diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -186,9 +186,10 @@ func checkDeployAnnotation(name, namespace, key, expectedValue string) error {
 	return nil
 }
 
-func checkPodAge(namespace, component string, smallerThan time.Duration) error {
-	stdout, _, err := kubectl(nil, "get", "pod", "-n", namespace,
-		"-l", "app.kubernetes.io/component="+component, "-o", "json")
+func checkPodAge(mastodonServerName, namespace, component string, smallerThan time.Duration) error {
+	stdout, _, err := kubectl(nil, "get", "pod", "-n", namespace, "-l", "-o", "json",
+		fmt.Sprintf("app.kubernetes.io/component=%s,magout.anqou.net/mastodon-server=%s",
+			component, mastodonServerName))
 	if err != nil {
 		return err
 	}
@@ -319,16 +320,16 @@ var _ = Describe("controller", Ordered, func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			Eventually(func() error {
-				return checkPodAge(namespace, "web", 30*time.Second)
+				return checkPodAge("mastodon0", namespace, "web", 30*time.Second)
 			}).Should(Succeed())
 			Consistently(func() error {
-				return checkPodAge(namespace, "web", 90*time.Second)
+				return checkPodAge("mastodon0", namespace, "web", 90*time.Second)
 			}, "100s", "1s").Should(Succeed())
 			Eventually(func() error {
-				return checkPodAge(namespace, "sidekiq", 30*time.Second)
+				return checkPodAge("mastodon0", namespace, "sidekiq", 30*time.Second)
 			}).Should(Succeed())
 			Consistently(func() error {
-				return checkPodAge(namespace, "sidekiq", 90*time.Second)
+				return checkPodAge("mastodon0", namespace, "sidekiq", 90*time.Second)
 			}, "100s", "1s").Should(Succeed())
 
 			_, _, err = kubectl(nil, "delete", "-n", namespace, "mastodonserver", "mastodon0")