From f55d5d35a4b5f2cd185cbd68e93a3a19865d2584 Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Thu, 11 Jul 2024 12:21:43 +0900
Subject: [PATCH] Fix finding related replica sets from argo rollouts

---
 config/manager/manager.yaml                   |  1 +
 internal/controller/argorollout_controller.go | 35 ++++++++++++++-----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index 15e95e6..db06a30 100755
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -70,6 +70,7 @@ spec:
         - /manager
         args:
         - --leader-elect
+        - -v 4
         image: manager
         name: manager
         securityContext:
diff --git a/internal/controller/argorollout_controller.go b/internal/controller/argorollout_controller.go
index 66427ce..7a9b39d 100644
--- a/internal/controller/argorollout_controller.go
+++ b/internal/controller/argorollout_controller.go
@@ -9,7 +9,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/record"
@@ -82,20 +81,21 @@ func (r *ArgoRolloutReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		}
 
 		rsHash := argoRollout.Status.StableRS
-		oldRS := []*appsv1.ReplicaSet{}
-		RSList := &appsv1.ReplicaSetList{}
-		if err := r.List(ctx, RSList, &client.ListOptions{LabelSelector: labels.SelectorFromSet(map[string]string{"app": argoRollout.Name})}); err != nil {
-			klog.Errorf("Failed to list ReplicaSet: %v", err)
+
+		RSList, err := r.findReplicaSets(ctx, argoRollout)
+		if err != nil {
+			klog.Errorf("Failed to find ReplicaSet: %v", err)
 			return ctrl.Result{}, err
 		}
 
-		for i := range RSList.Items {
-			rs := RSList.Items[i]
+		oldRS := []*appsv1.ReplicaSet{}
+		for i := range RSList {
+			rs := RSList[i]
 			if rs.Name == argoRollout.Name+"-"+rsHash {
 				continue
 			}
 			if rs.Status.Replicas > 0 {
-				oldRS = append(oldRS, &rs)
+				oldRS = append(oldRS, rs)
 			}
 		}
 		if len(oldRS) == 0 {
@@ -158,6 +158,25 @@ func isCompleted(status *argorolloutsapiv1alpha1.RolloutStatus) bool {
 	return false
 }
 
+func (r *ArgoRolloutReconciler) findReplicaSets(ctx context.Context, rollout *argorolloutsapiv1alpha1.Rollout) ([]*appsv1.ReplicaSet, error) {
+	list := &appsv1.ReplicaSetList{}
+	if err := r.List(ctx, list, &client.ListOptions{Namespace: rollout.Namespace}); err != nil {
+		klog.Errorf("Failed to list ReplicaSet: %v", err)
+		return nil, err
+	}
+	results := []*appsv1.ReplicaSet{}
+	for i := range list.Items {
+		rs := list.Items[i]
+		for _, owner := range rs.OwnerReferences {
+			if owner.Kind == "Rollout" && owner.Name == rollout.Name {
+				results = append(results, &rs)
+				continue
+			}
+		}
+	}
+	return results, nil
+}
+
 func (r *ArgoRolloutReconciler) scaleDown(ctx context.Context, rs *appsv1.ReplicaSet, scaleDown *optimizerv1alpha1.RolloutScaleDown, rollout *argorolloutsapiv1alpha1.Rollout) (time.Duration, error) {
 	rolloutUpdated := time.Now()
 	for _, cond := range rollout.Status.Conditions {