From 41aa7709b067ff1d4af3cd381111153fd8835276 Mon Sep 17 00:00:00 2001
From: Markus Rudy <mr@edgeless.systems>
Date: Wed, 13 Mar 2024 13:51:34 +0100
Subject: [PATCH] e2e: lookup pod by ancestry instead of by label

---
 e2e/internal/kubeclient/kubeclient.go | 29 +++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/e2e/internal/kubeclient/kubeclient.go b/e2e/internal/kubeclient/kubeclient.go
index 8eeedd5cdb..82c0cc005a 100644
--- a/e2e/internal/kubeclient/kubeclient.go
+++ b/e2e/internal/kubeclient/kubeclient.go
@@ -72,15 +72,36 @@ func NewForTest(t *testing.T) *Kubeclient {
 }
 
 // PodsFromDeployment returns the pods from a deployment in a namespace.
+//
+// A pod is considered to belong to a deployment if it is owned by a ReplicaSet which is in turn
+// owned by the Deployment in question.
 func (c *Kubeclient) PodsFromDeployment(ctx context.Context, namespace, deployment string) ([]v1.Pod, error) {
-	pods, err := c.client.CoreV1().Pods(namespace).List(ctx, metav1.ListOptions{
-		LabelSelector: fmt.Sprintf("app.kubernetes.io/name=%s", deployment),
-	})
+	replicasets, err := c.client.AppsV1().ReplicaSets(namespace).List(ctx, metav1.ListOptions{})
+	if err != nil {
+		return nil, fmt.Errorf("listing replicasets: %w", err)
+	}
+	pods, err := c.client.CoreV1().Pods(namespace).List(ctx, metav1.ListOptions{})
 	if err != nil {
 		return nil, fmt.Errorf("listing pods: %w", err)
 	}
 
-	return pods.Items, nil
+	var out []v1.Pod
+	for _, replicaset := range replicasets.Items {
+		for _, ref := range replicaset.OwnerReferences {
+			if ref.Kind != "Deployment" || ref.Name != deployment {
+				continue
+			}
+			for _, pod := range pods.Items {
+				for _, ref := range pod.OwnerReferences {
+					if ref.Kind == "ReplicaSet" && ref.UID == replicaset.UID {
+						out = append(out, pod)
+					}
+				}
+			}
+		}
+	}
+
+	return out, nil
 }
 
 // Exec executes a process in a pod and returns the stdout and stderr.