feat: SaveLogsOnlyForNumberOfContainers option

Signed-off-by: Ilya Lesikov <[email protected]>

Author: ilya-lesikov

pkg/tracker/daemonset/tracker.go

@@ -58,6 +58,7 @@ type Tracker struct {
 
 	ignoreLogs                               bool
 	ignoreReadinessProbeFailsByContainerName map[string]time.Duration
+	savingLogsReplicas                       int
 
 	lastObject     *appsv1.DaemonSet
 	failedReason   string
@@ -79,12 +80,13 @@ type Tracker struct {
 func NewTracker(name, namespace string, kube kubernetes.Interface, informerFactory *util.Concurrent[*informer.InformerFactory], opts tracker.Options) *Tracker {
 	return &Tracker{
 		Tracker: tracker.Tracker{
-			Kube:             kube,
-			Namespace:        namespace,
-			FullResourceName: fmt.Sprintf("ds/%s", name),
-			ResourceName:     name,
-			LogsFromTime:     opts.LogsFromTime,
-			InformerFactory:  informerFactory,
+			Kube:                            kube,
+			Namespace:                       namespace,
+			FullResourceName:                fmt.Sprintf("ds/%s", name),
+			ResourceName:                    name,
+			SaveLogsOnlyForNumberOfReplicas: opts.SaveLogsOnlyForNumberOfReplicas,
+			LogsFromTime:                    opts.LogsFromTime,
+			InformerFactory:                 informerFactory,
 		},
 
 		podStatuses:    make(map[string]pod.PodStatus),
@@ -356,9 +358,14 @@ func (d *Tracker) runPodTracker(ctx context.Context, podName string) error {
 	errorChan := make(chan error, 1)
 	doneChan := make(chan struct{})
 
+	ignoreLogs := d.ignoreLogs || d.savingLogsReplicas >= d.SaveLogsOnlyForNumberOfReplicas
+	if !ignoreLogs {
+		d.savingLogsReplicas++
+	}
+
 	newCtx, cancelPodCtx := context.WithCancelCause(ctx)
 	podTracker := pod.NewTracker(podName, d.Namespace, d.Kube, d.InformerFactory, pod.Options{
-		IgnoreLogs:                               d.ignoreLogs,
+		IgnoreLogs:                               ignoreLogs,
 		IgnoreReadinessProbeFailsByContainerName: d.ignoreReadinessProbeFailsByContainerName,
 	})
 	if !d.LogsFromTime.IsZero() {

pkg/tracker/deployment/tracker.go

@@ -55,6 +55,7 @@ type Tracker struct {
 
 	ignoreLogs                               bool
 	ignoreReadinessProbeFailsByContainerName map[string]time.Duration
+	savingLogsReplicas                       int
 
 	TrackedPodsNames []string
 
@@ -88,12 +89,13 @@ type Tracker struct {
 func NewTracker(name, namespace string, kube kubernetes.Interface, informerFactory *util.Concurrent[*informer.InformerFactory], opts tracker.Options) *Tracker {
 	return &Tracker{
 		Tracker: tracker.Tracker{
-			Kube:             kube,
-			Namespace:        namespace,
-			FullResourceName: fmt.Sprintf("deploy/%s", name),
-			ResourceName:     name,
-			LogsFromTime:     opts.LogsFromTime,
-			InformerFactory:  informerFactory,
+			Kube:                            kube,
+			Namespace:                       namespace,
+			FullResourceName:                fmt.Sprintf("deploy/%s", name),
+			ResourceName:                    name,
+			SaveLogsOnlyForNumberOfReplicas: opts.SaveLogsOnlyForNumberOfReplicas,
+			LogsFromTime:                    opts.LogsFromTime,
+			InformerFactory:                 informerFactory,
 		},
 
 		Added:  make(chan DeploymentStatus, 1),
@@ -489,9 +491,14 @@ func (d *Tracker) runPodTracker(_ctx context.Context, podName, rsName string) er
 	errorChan := make(chan error, 1)
 	doneChan := make(chan struct{})
 
+	ignoreLogs := d.ignoreLogs || d.savingLogsReplicas >= d.SaveLogsOnlyForNumberOfReplicas
+	if !ignoreLogs {
+		d.savingLogsReplicas++
+	}
+
 	newCtx, cancelPodCtx := context.WithCancelCause(_ctx)
 	podTracker := pod.NewTracker(podName, d.Namespace, d.Kube, d.InformerFactory, pod.Options{
-		IgnoreLogs:                               d.ignoreLogs,
+		IgnoreLogs:                               ignoreLogs,
 		IgnoreReadinessProbeFailsByContainerName: d.ignoreReadinessProbeFailsByContainerName,
 	})
 	if !d.LogsFromTime.IsZero() {

pkg/tracker/job/tracker.go

@@ -62,6 +62,7 @@ type Tracker struct {
 
 	ignoreLogs                               bool
 	ignoreReadinessProbeFailsByContainerName map[string]time.Duration
+	savingLogsReplicas                       int
 
 	objectAdded    chan *batchv1.Job
 	objectModified chan *batchv1.Job
@@ -80,12 +81,13 @@ type Tracker struct {
 func NewTracker(name, namespace string, kube kubernetes.Interface, informerFactory *util.Concurrent[*informer.InformerFactory], opts tracker.Options) *Tracker {
 	return &Tracker{
 		Tracker: tracker.Tracker{
-			Kube:             kube,
-			Namespace:        namespace,
-			FullResourceName: fmt.Sprintf("job/%s", name),
-			ResourceName:     name,
-			LogsFromTime:     opts.LogsFromTime,
-			InformerFactory:  informerFactory,
+			Kube:                            kube,
+			Namespace:                       namespace,
+			FullResourceName:                fmt.Sprintf("job/%s", name),
+			ResourceName:                    name,
+			SaveLogsOnlyForNumberOfReplicas: opts.SaveLogsOnlyForNumberOfReplicas,
+			LogsFromTime:                    opts.LogsFromTime,
+			InformerFactory:                 informerFactory,
 		},
 
 		Added:     make(chan JobStatus, 1),
@@ -391,9 +393,14 @@ func (job *Tracker) runPodTracker(_ctx context.Context, podName string) error {
 	errorChan := make(chan error, 1)
 	doneChan := make(chan struct{})
 
+	ignoreLogs := job.ignoreLogs || job.savingLogsReplicas >= job.SaveLogsOnlyForNumberOfReplicas
+	if !ignoreLogs {
+		job.savingLogsReplicas++
+	}
+
 	newCtx, cancelPodCtx := context.WithCancelCause(_ctx)
 	podTracker := pod.NewTracker(podName, job.Namespace, job.Kube, job.InformerFactory, pod.Options{
-		IgnoreLogs:                               job.ignoreLogs,
+		IgnoreLogs:                               ignoreLogs,
 		IgnoreReadinessProbeFailsByContainerName: job.ignoreReadinessProbeFailsByContainerName,
 	})
 	if !job.LogsFromTime.IsZero() {

pkg/tracker/replicaset/informer.go

@@ -54,11 +54,12 @@ type ReplicaSetInformer struct {
 func NewReplicaSetInformer(trk *tracker.Tracker, controller utils.ControllerMetadata) *ReplicaSetInformer {
 	return &ReplicaSetInformer{
 		Tracker: tracker.Tracker{
-			Kube:             trk.Kube,
-			Namespace:        trk.Namespace,
-			ResourceName:     trk.ResourceName,
-			FullResourceName: trk.FullResourceName,
-			InformerFactory:  trk.InformerFactory,
+			Kube:                            trk.Kube,
+			Namespace:                       trk.Namespace,
+			ResourceName:                    trk.ResourceName,
+			FullResourceName:                trk.FullResourceName,
+			InformerFactory:                 trk.InformerFactory,
+			SaveLogsOnlyForNumberOfReplicas: trk.SaveLogsOnlyForNumberOfReplicas,
 		},
 		Controller:         controller,
 		ReplicaSetAdded:    make(chan *appsv1.ReplicaSet, 1),

pkg/tracker/statefulset/tracker.go

@@ -49,6 +49,7 @@ type Tracker struct {
 
 	ignoreLogs                               bool
 	ignoreReadinessProbeFailsByContainerName map[string]time.Duration
+	savingLogsReplicas                       int
 
 	TrackedPodsNames []string
 
@@ -78,12 +79,13 @@ type Tracker struct {
 func NewTracker(name, namespace string, kube kubernetes.Interface, informerFactory *util.Concurrent[*informer.InformerFactory], opts tracker.Options) *Tracker {
 	return &Tracker{
 		Tracker: tracker.Tracker{
-			Kube:             kube,
-			Namespace:        namespace,
-			FullResourceName: fmt.Sprintf("sts/%s", name),
-			ResourceName:     name,
-			LogsFromTime:     opts.LogsFromTime,
-			InformerFactory:  informerFactory,
+			Kube:                            kube,
+			Namespace:                       namespace,
+			FullResourceName:                fmt.Sprintf("sts/%s", name),
+			ResourceName:                    name,
+			SaveLogsOnlyForNumberOfReplicas: opts.SaveLogsOnlyForNumberOfReplicas,
+			LogsFromTime:                    opts.LogsFromTime,
+			InformerFactory:                 informerFactory,
 		},
 
 		Added:  make(chan StatefulSetStatus, 1),
@@ -364,9 +366,14 @@ func (d *Tracker) runPodTracker(_ctx context.Context, podName string) error {
 	errorChan := make(chan error, 1)
 	doneChan := make(chan struct{})
 
+	ignoreLogs := d.ignoreLogs || d.savingLogsReplicas >= d.SaveLogsOnlyForNumberOfReplicas
+	if !ignoreLogs {
+		d.savingLogsReplicas++
+	}
+
 	newCtx, cancelPodCtx := context.WithCancelCause(_ctx)
 	podTracker := pod.NewTracker(podName, d.Namespace, d.Kube, d.InformerFactory, pod.Options{
-		IgnoreLogs:                               d.ignoreLogs,
+		IgnoreLogs:                               ignoreLogs,
 		IgnoreReadinessProbeFailsByContainerName: d.ignoreReadinessProbeFailsByContainerName,
 	})
 	if !d.LogsFromTime.IsZero() {

pkg/tracker/tracker.go

@@ -30,12 +30,13 @@ const (
 type TrackerState string
 
 type Tracker struct {
-	Kube             kubernetes.Interface
-	Namespace        string
-	ResourceName     string
-	FullResourceName string // full resource name with resource kind (deploy/superapp)
-	LogsFromTime     time.Time
-	InformerFactory  *util.Concurrent[*informer.InformerFactory]
+	Kube                            kubernetes.Interface
+	Namespace                       string
+	ResourceName                    string
+	FullResourceName                string // full resource name with resource kind (deploy/superapp)
+	SaveLogsOnlyForNumberOfReplicas int
+	LogsFromTime                    time.Time
+	InformerFactory                 *util.Concurrent[*informer.InformerFactory]
 
 	StatusGeneration uint64
 }
@@ -44,6 +45,7 @@ type Options struct {
 	ParentContext                            context.Context
 	Timeout                                  time.Duration
 	LogsFromTime                             time.Time
+	SaveLogsOnlyForNumberOfReplicas          int
 	IgnoreLogs                               bool
 	IgnoreReadinessProbeFailsByContainerName map[string]time.Duration
 }

pkg/trackers/dyntracker/dynamic_readiness_tracker.go

@@ -46,14 +46,15 @@ type DynamicReadinessTracker struct {
 	timeout           time.Duration
 	noActivityTimeout time.Duration
 
-	saveLogsOnlyForContainers    []string
-	saveLogsByRegex              *regexp.Regexp
-	saveLogsByRegexForContainers map[string]*regexp.Regexp
-	skipLogsByRegex              *regexp.Regexp
-	skipLogsByRegexForContainers map[string]*regexp.Regexp
-	ignoreLogs                   bool
-	ignoreLogsForContainers      []string
-	saveEvents                   bool
+	saveLogsOnlyForNumberOfReplicas int
+	saveLogsOnlyForContainers       []string
+	saveLogsByRegex                 *regexp.Regexp
+	saveLogsByRegexForContainers    map[string]*regexp.Regexp
+	skipLogsByRegex                 *regexp.Regexp
+	skipLogsByRegexForContainers    map[string]*regexp.Regexp
+	ignoreLogs                      bool
+	ignoreLogsForContainers         []string
+	saveEvents                      bool
 }
 
 func NewDynamicReadinessTracker(
@@ -112,6 +113,7 @@ func NewDynamicReadinessTracker(
 			ParentContext:                            ctx,
 			Timeout:                                  timeout,
 			LogsFromTime:                             captureLogsFromTime,
+			SaveLogsOnlyForNumberOfReplicas:          opts.SaveLogsOnlyForNumberOfReplicas,
 			IgnoreLogs:                               opts.IgnoreLogs,
 			IgnoreReadinessProbeFailsByContainerName: ignoreReadinessProbeFailsByContainerName,
 		})
@@ -120,6 +122,7 @@ func NewDynamicReadinessTracker(
 			ParentContext:                            ctx,
 			Timeout:                                  timeout,
 			LogsFromTime:                             captureLogsFromTime,
+			SaveLogsOnlyForNumberOfReplicas:          opts.SaveLogsOnlyForNumberOfReplicas,
 			IgnoreLogs:                               opts.IgnoreLogs,
 			IgnoreReadinessProbeFailsByContainerName: ignoreReadinessProbeFailsByContainerName,
 		})
@@ -135,6 +138,7 @@ func NewDynamicReadinessTracker(
 			ParentContext:                            ctx,
 			Timeout:                                  timeout,
 			LogsFromTime:                             captureLogsFromTime,
+			SaveLogsOnlyForNumberOfReplicas:          opts.SaveLogsOnlyForNumberOfReplicas,
 			IgnoreLogs:                               opts.IgnoreLogs,
 			IgnoreReadinessProbeFailsByContainerName: ignoreReadinessProbeFailsByContainerName,
 		})
@@ -143,6 +147,7 @@ func NewDynamicReadinessTracker(
 			ParentContext:                            ctx,
 			Timeout:                                  timeout,
 			LogsFromTime:                             captureLogsFromTime,
+			SaveLogsOnlyForNumberOfReplicas:          opts.SaveLogsOnlyForNumberOfReplicas,
 			IgnoreLogs:                               opts.IgnoreLogs,
 			IgnoreReadinessProbeFailsByContainerName: ignoreReadinessProbeFailsByContainerName,
 		})
@@ -181,6 +186,7 @@ type DynamicReadinessTrackerOptions struct {
 	NoActivityTimeout                        time.Duration
 	IgnoreReadinessProbeFailsByContainerName map[string]time.Duration
 	CaptureLogsFromTime                      time.Time
+	SaveLogsOnlyForNumberOfReplicas          int
 	SaveLogsOnlyForContainers                []string
 	SaveLogsByRegex                          *regexp.Regexp
 	SaveLogsByRegexForContainers             map[string]*regexp.Regexp