Remove maxRetries configuration from CLI and Helm values, setting a default of 15 retries for log send failures.

Author: kacpersaw

helm/templates/service.yaml

@@ -120,10 +120,6 @@ spec:
             - name: SSL_CERT_DIR
               value: {{ .Values.image.sslCertDir }}
             {{- end }}
-            {{- if .Values.maxRetries }}
-            - name: CODER_MAX_RETRIES
-              value: "{{ .Values.maxRetries }}"
-            {{- end }}
           {{- with .Values.securityContext }}
           securityContext:
             {{- toYaml . | nindent 12 }}

helm/values.yaml

@@ -5,9 +5,6 @@ url: ""
 # If unspecified or empty it will watch all namespaces.
 namespaces: []
 
-# maxRetries -- Maximum retry attempts for failed log sends (logs are discarded after this limit)
-maxRetries: 10
-
 # volumes -- A list of extra volumes to add to the coder-logstream pod.
 volumes:
   #   emptyDir: {}

main.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"net/url"
 	"os"
-	"strconv"
 	"strings"
 
 	"cdr.dev/slog"
@@ -31,7 +30,6 @@ func root() *cobra.Command {
 		kubeConfig    string
 		namespacesStr string
 		labelSelector string
-		maxRetriesStr string
 	)
 	cmd := &cobra.Command{
 		Use:   "coder-logstream-kube",
@@ -74,19 +72,14 @@ func root() *cobra.Command {
 				}
 			}
 
-			maxRetries, err := strconv.Atoi(maxRetriesStr)
-			if err != nil {
-				return fmt.Errorf("parse max retries: %w", err)
-			}
-
 			reporter, err := newPodEventLogger(cmd.Context(), podEventLoggerOptions{
 				coderURL:      parsedURL,
 				client:        client,
 				namespaces:    namespaces,
 				fieldSelector: fieldSelector,
 				labelSelector: labelSelector,
 				logger:        slog.Make(sloghuman.Sink(cmd.ErrOrStderr())).Leveled(slog.LevelDebug),
-				maxRetries:    maxRetries,
+				maxRetries:    15, // 15 retries is the default max retries for a log send failure.
 			})
 			if err != nil {
 				return fmt.Errorf("create pod event reporter: %w", err)
@@ -105,7 +98,6 @@ func root() *cobra.Command {
 	cmd.Flags().StringVarP(&namespacesStr, "namespaces", "n", os.Getenv("CODER_NAMESPACES"), "List of namespaces to use when listing pods")
 	cmd.Flags().StringVarP(&fieldSelector, "field-selector", "f", "", "Field selector to use when listing pods")
 	cmd.Flags().StringVarP(&labelSelector, "label-selector", "l", "", "Label selector to use when listing pods")
-	cmd.Flags().StringVarP(&maxRetriesStr, "max-retries", "m", os.Getenv("CODER_MAX_RETRIES"), "Maximum retry attempts for failed log sends (logs are discarded after this limit)")
 
 	return cmd
 }