From 50a1e32da3063ce3a90df31096653ba65ff51d0b Mon Sep 17 00:00:00 2001
From: Somtochi Onyekwere <somtochionyekwere@gmail.com>
Date: Sat, 2 Oct 2021 14:06:11 +0100
Subject: [PATCH] Sort pods from each deployment to get first and ready pod
Signed-off-by: Somtochi Onyekwere <somtochionyekwere@gmail.com>
---
cmd/flux/logs.go | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/cmd/flux/logs.go b/cmd/flux/logs.go
index 355cdfd0..8e278eb7 100644
--- a/cmd/flux/logs.go
+++ b/cmd/flux/logs.go
@@ -24,6 +24,7 @@ import (
"html/template"
"io"
"os"
+ "sort"
"strings"
"sync"
"time"
@@ -34,6 +35,7 @@ import (
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"k8s.io/kubectl/pkg/util"
+ "k8s.io/kubectl/pkg/util/podutils"
"github.com/fluxcd/flux2/internal/flags"
"github.com/fluxcd/flux2/internal/utils"
@@ -174,7 +176,17 @@ func getPods(ctx context.Context, c *kubernetes.Clientset, label string) ([]core
if err != nil {
return ret, err
}
- ret = append(ret, podList.Items...)
+ pods := []*corev1.Pod{}
+ for i := range podList.Items {
+ pod := podList.Items[i]
+ pods = append(pods, &pod)
+ }
+
+ if len(pods) > 0 {
+ // sort pods to prioritize running pods over others
+ sort.Sort(podutils.ByLogging(pods))
+ ret = append(ret, *pods[0])
+ }
}
return ret, nil
--
GitLab