feat(tracker): pass DynamicReadinessTrackerOptions.IgnoreLogs option down to pod tracker

Signed-off-by: Alexandr Zaytsev <[email protected]>

Author: nervgh

pkg/tracker/daemonset/tracker.go

@@ -55,6 +55,7 @@ type Tracker struct {
 	PodLogChunk chan *replicaset.ReplicaSetPodLogChunk
 	PodError    chan PodErrorReport
 
+	ignoreLogs                               bool
 	ignoreReadinessProbeFailsByContainerName map[string]time.Duration
 
 	lastObject     *appsv1.DaemonSet
@@ -87,6 +88,7 @@ func NewTracker(name, namespace string, kube kubernetes.Interface, opts tracker.
 		podStatuses:    make(map[string]pod.PodStatus),
 		podGenerations: make(map[string]string),
 
+		ignoreLogs:                               opts.IgnoreLogs,
 		ignoreReadinessProbeFailsByContainerName: opts.IgnoreReadinessProbeFailsByContainerName,
 
 		Added:  make(chan DaemonSetStatus, 1),
@@ -335,6 +337,7 @@ func (d *Tracker) runPodTracker(ctx context.Context, podName string) error {
 
 	newCtx, cancelPodCtx := context.WithCancelCause(ctx)
 	podTracker := pod.NewTracker(podName, d.Namespace, d.Kube, pod.Options{
+		IgnoreLogs:                               d.ignoreLogs,
 		IgnoreReadinessProbeFailsByContainerName: d.ignoreReadinessProbeFailsByContainerName,
 	})
 	if !d.LogsFromTime.IsZero() {

pkg/tracker/deployment/tracker.go

@@ -52,6 +52,7 @@ type Tracker struct {
 	podStatuses      map[string]pod.PodStatus
 	rsNameByPod      map[string]string
 
+	ignoreLogs                               bool
 	ignoreReadinessProbeFailsByContainerName map[string]time.Duration
 
 	TrackedPodsNames []string
@@ -108,6 +109,7 @@ func NewTracker(name, namespace string, kube kubernetes.Interface, opts tracker.
 		podStatuses:      make(map[string]pod.PodStatus),
 		rsNameByPod:      make(map[string]string),
 
+		ignoreLogs:                               opts.IgnoreLogs,
 		ignoreReadinessProbeFailsByContainerName: opts.IgnoreReadinessProbeFailsByContainerName,
 
 		errors:             make(chan error, 1),
@@ -468,6 +470,7 @@ func (d *Tracker) runPodTracker(_ctx context.Context, podName, rsName string) er
 
 	newCtx, cancelPodCtx := context.WithCancelCause(_ctx)
 	podTracker := pod.NewTracker(podName, d.Namespace, d.Kube, pod.Options{
+		IgnoreLogs:                               d.ignoreLogs,
 		IgnoreReadinessProbeFailsByContainerName: d.ignoreReadinessProbeFailsByContainerName,
 	})
 	if !d.LogsFromTime.IsZero() {

pkg/tracker/job/tracker.go

@@ -59,6 +59,7 @@ type Tracker struct {
 	failedReason string
 	podStatuses  map[string]pod.PodStatus
 
+	ignoreLogs                               bool
 	ignoreReadinessProbeFailsByContainerName map[string]time.Duration
 
 	objectAdded    chan *batchv1.Job
@@ -97,6 +98,7 @@ func NewTracker(name, namespace string, kube kubernetes.Interface, opts tracker.
 
 		podStatuses: make(map[string]pod.PodStatus),
 
+		ignoreLogs:                               opts.IgnoreLogs,
 		ignoreReadinessProbeFailsByContainerName: opts.IgnoreReadinessProbeFailsByContainerName,
 
 		State: tracker.Initial,
@@ -355,6 +357,7 @@ func (job *Tracker) runPodTracker(_ctx context.Context, podName string) error {
 
 	newCtx, cancelPodCtx := context.WithCancelCause(_ctx)
 	podTracker := pod.NewTracker(podName, job.Namespace, job.Kube, pod.Options{
+		IgnoreLogs:                               job.ignoreLogs,
 		IgnoreReadinessProbeFailsByContainerName: job.ignoreReadinessProbeFailsByContainerName,
 	})
 	if !job.LogsFromTime.IsZero() {

pkg/tracker/pod/feed.go

@@ -89,7 +89,8 @@ func (f *feed) Track(name, namespace string, kube kubernetes.Interface, opts tra
 	defer cancel()
 
 	pod := NewTracker(name, namespace, kube, Options{
-		opts.IgnoreReadinessProbeFailsByContainerName,
+		IgnoreLogs:                               opts.IgnoreLogs,
+		IgnoreReadinessProbeFailsByContainerName: opts.IgnoreReadinessProbeFailsByContainerName,
 	})
 
 	go func() {

pkg/tracker/pod/tracker.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/samber/lo"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
@@ -78,6 +79,8 @@ type Tracker struct {
 	TrackedContainers []string
 	LogsFromTime      time.Time
 
+	ignoreLogs bool
+
 	readinessProbes                          map[string]*ReadinessProbe
 	ignoreReadinessProbeFailsByContainerName map[string]time.Duration
 
@@ -95,6 +98,7 @@ type Tracker struct {
 
 type Options struct {
 	IgnoreReadinessProbeFailsByContainerName map[string]time.Duration
+	IgnoreLogs                               bool
 }
 
 func NewTracker(name, namespace string, kube kubernetes.Interface, opts Options) *Tracker {
@@ -122,6 +126,8 @@ func NewTracker(name, namespace string, kube kubernetes.Interface, opts Options)
 		ContainerTrackerStateChanges: make(map[string]chan tracker.TrackerState),
 		LogsFromTime:                 time.Time{},
 
+		ignoreLogs: opts.IgnoreLogs,
+
 		readinessProbes:                          make(map[string]*ReadinessProbe),
 		ignoreReadinessProbeFailsByContainerName: opts.IgnoreReadinessProbeFailsByContainerName,
 
@@ -392,7 +398,7 @@ func (pod *Tracker) handleContainersState(object *corev1.Pod) error {
 	for _, cs := range allContainerStatuses {
 		if cs.State.Running != nil || cs.State.Terminated != nil {
 			oldState := pod.ContainerTrackerStates[cs.Name]
-			newState := tracker.FollowingContainerLogs
+			newState := lo.Ternary(pod.ignoreLogs, tracker.ContainerTrackerDone, tracker.FollowingContainerLogs)
 
 			if oldState != newState {
 				pod.ContainerTrackerStates[cs.Name] = newState
@@ -409,6 +415,10 @@ func (pod *Tracker) handleContainersState(object *corev1.Pod) error {
 }
 
 func (pod *Tracker) followContainerLogs(ctx context.Context, containerName string) error {
+	if pod.ignoreLogs {
+		return nil
+	}
+
 	logOpts := &corev1.PodLogOptions{
 		Container:  containerName,
 		Timestamps: true,

pkg/tracker/statefulset/tracker.go

@@ -46,6 +46,7 @@ type Tracker struct {
 	podStatuses  map[string]pod.PodStatus
 	podRevisions map[string]string
 
+	ignoreLogs                               bool
 	ignoreReadinessProbeFailsByContainerName map[string]time.Duration
 
 	TrackedPodsNames []string
@@ -93,6 +94,7 @@ func NewTracker(name, namespace string, kube kubernetes.Interface, opts tracker.
 		PodLogChunk: make(chan *replicaset.ReplicaSetPodLogChunk, 1000),
 		PodError:    make(chan PodErrorReport),
 
+		ignoreLogs:                               opts.IgnoreLogs,
 		ignoreReadinessProbeFailsByContainerName: opts.IgnoreReadinessProbeFailsByContainerName,
 
 		podStatuses:  make(map[string]pod.PodStatus),
@@ -341,6 +343,7 @@ func (d *Tracker) runPodTracker(_ctx context.Context, podName string) error {
 
 	newCtx, cancelPodCtx := context.WithCancelCause(_ctx)
 	podTracker := pod.NewTracker(podName, d.Namespace, d.Kube, pod.Options{
+		IgnoreLogs:                               d.ignoreLogs,
 		IgnoreReadinessProbeFailsByContainerName: d.ignoreReadinessProbeFailsByContainerName,
 	})
 	if !d.LogsFromTime.IsZero() {

pkg/tracker/tracker.go

@@ -40,6 +40,7 @@ type Options struct {
 	ParentContext                            context.Context
 	Timeout                                  time.Duration
 	LogsFromTime                             time.Time
+	IgnoreLogs                               bool
 	IgnoreReadinessProbeFailsByContainerName map[string]time.Duration
 }
 

pkg/trackers/dyntracker/dynamic_readiness_tracker.go

@@ -108,13 +108,15 @@ func NewDynamicReadinessTracker(
 			ParentContext:                            ctx,
 			Timeout:                                  timeout,
 			LogsFromTime:                             captureLogsFromTime,
+			IgnoreLogs:                               opts.IgnoreLogs,
 			IgnoreReadinessProbeFailsByContainerName: ignoreReadinessProbeFailsByContainerName,
 		})
 	case schema.GroupKind{Group: "apps", Kind: "DaemonSet"}, schema.GroupKind{Group: "extensions", Kind: "DaemonSet"}:
 		tracker = daemonset.NewTracker(resourceName, resourceNamespace, staticClient, commontracker.Options{
 			ParentContext:                            ctx,
 			Timeout:                                  timeout,
 			LogsFromTime:                             captureLogsFromTime,
+			IgnoreLogs:                               opts.IgnoreLogs,
 			IgnoreReadinessProbeFailsByContainerName: ignoreReadinessProbeFailsByContainerName,
 		})
 	case schema.GroupKind{Group: "flagger.app", Kind: "Canary"}:
@@ -129,13 +131,15 @@ func NewDynamicReadinessTracker(
 			ParentContext:                            ctx,
 			Timeout:                                  timeout,
 			LogsFromTime:                             captureLogsFromTime,
+			IgnoreLogs:                               opts.IgnoreLogs,
 			IgnoreReadinessProbeFailsByContainerName: ignoreReadinessProbeFailsByContainerName,
 		})
 	case schema.GroupKind{Group: "batch", Kind: "Job"}:
 		tracker = job.NewTracker(resourceName, resourceNamespace, staticClient, commontracker.Options{
 			ParentContext:                            ctx,
 			Timeout:                                  timeout,
 			LogsFromTime:                             captureLogsFromTime,
+			IgnoreLogs:                               opts.IgnoreLogs,
 			IgnoreReadinessProbeFailsByContainerName: ignoreReadinessProbeFailsByContainerName,
 		})
 	default:

playground/table/main.go

@@ -4,9 +4,9 @@ import (
 	"context"
 
 	"github.com/gookit/color"
-	"github.com/werf/logboek"
 
 	"github.com/werf/kubedog/pkg/utils"
+	"github.com/werf/logboek"
 )
 
 func main() {