Override zap log level from old flag

charts/fleet/templates/deployment_gitjob.yaml

@@ -44,6 +44,8 @@ spec:
           - "{{ template "system_default_registry" $ }}{{ $.Values.image.repository }}:{{ $.Values.image.tag }}"
           {{- if $.Values.debug }}
           - --debug
+          - --debug-level
+          - {{ quote $.Values.debugLevel }}
           {{- end }}
           {{- if $shard.id }}
           - --shard-id

go.mod

@@ -47,6 +47,7 @@ require (
 	github.com/stretchr/testify v1.9.0
 	github.com/testcontainers/testcontainers-go v0.31.0
 	go.uber.org/mock v0.4.0
+	go.uber.org/zap v1.26.0
 	golang.org/x/crypto v0.24.0
 	golang.org/x/sync v0.7.0
 	gopkg.in/go-playground/webhooks.v5 v5.17.0
@@ -220,7 +221,6 @@ require (
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
 	go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.26.0 // indirect
 	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
 	golang.org/x/mod v0.18.0 // indirect
 	golang.org/x/net v0.26.0 // indirect

internal/cmd/agent/clusterstatus.go

@@ -59,12 +59,12 @@ func (cs *ClusterStatus) PersistentPre(cmd *cobra.Command, _ []string) error {
 	if err := cs.SetupDebug(); err != nil {
 		return fmt.Errorf("failed to setup debug logging: %w", err)
 	}
+	zopts = cs.OverrideZapOpts(zopts)
 	return nil
 }
 
 func (cs *ClusterStatus) Run(cmd *cobra.Command, args []string) error {
-	zopts.Development = cs.Debug
-	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&zopts)))
+	ctrl.SetLogger(zap.New(zap.UseFlagOptions(zopts)))
 	ctx := log.IntoContext(cmd.Context(), ctrl.Log)
 
 	var err error

internal/cmd/agent/register.go

@@ -39,12 +39,12 @@ func (r *Register) PersistentPre(cmd *cobra.Command, _ []string) error {
 	if err := r.SetupDebug(); err != nil {
 		return fmt.Errorf("failed to setup debug logging: %w", err)
 	}
+	zopts = r.OverrideZapOpts(zopts)
 	return nil
 }
 
 func (r *Register) Run(cmd *cobra.Command, args []string) error {
-	zopts.Development = r.Debug
-	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&zopts)))
+	ctrl.SetLogger(zap.New(zap.UseFlagOptions(zopts)))
 	ctx := log.IntoContext(cmd.Context(), ctrl.Log)
 
 	clientConfig := kubeconfig.GetNonInteractiveClientConfig(r.Kubeconfig)

internal/cmd/agent/root.go

@@ -29,7 +29,7 @@ type FleetAgent struct {
 
 var (
 	setupLog = ctrl.Log.WithName("setup")
-	zopts    = zap.Options{
+	zopts    = &zap.Options{
 		Development: true,
 	}
 )
@@ -38,13 +38,12 @@ func (a *FleetAgent) PersistentPre(cmd *cobra.Command, _ []string) error {
 	if err := a.SetupDebug(); err != nil {
 		return fmt.Errorf("failed to setup debug logging: %w", err)
 	}
+	zopts = a.OverrideZapOpts(zopts)
 	return nil
 }
 
 func (a *FleetAgent) Run(cmd *cobra.Command, args []string) error {
-	// for compatibility, override zap opts with legacy debug opts. remove once manifests are updated.
-	zopts.Development = a.Debug
-	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&zopts)))
+	ctrl.SetLogger(zap.New(zap.UseFlagOptions(zopts)))
 	ctx := log.IntoContext(cmd.Context(), ctrl.Log)
 
 	localConfig := ctrl.GetConfigOrDie()

internal/cmd/controller/gitops/operator.go

@@ -74,13 +74,12 @@ func (g *GitOperator) PersistentPre(_ *cobra.Command, _ []string) error {
 	if err := g.SetupDebug(); err != nil {
 		return fmt.Errorf("failed to setup debug logging: %w", err)
 	}
+	zopts = g.OverrideZapOpts(zopts)
 
 	return nil
 }
 
 func (g *GitOperator) Run(cmd *cobra.Command, args []string) error {
-	// TODO for compatibility, override zap opts with legacy debug opts. remove once manifests are updated.
-	zopts.Development = g.Debug
 	ctrl.SetLogger(zap.New(zap.UseFlagOptions(zopts)))
 	ctx := clog.IntoContext(cmd.Context(), ctrl.Log.WithName("gitjob-reconciler"))
 

internal/cmd/controller/root.go

@@ -50,7 +50,7 @@ type BindAddresses struct {
 
 var (
 	setupLog = ctrl.Log.WithName("setup")
-	zopts    = zap.Options{
+	zopts    = &zap.Options{
 		Development: true,
 	}
 )
@@ -59,14 +59,13 @@ func (f *FleetManager) PersistentPre(_ *cobra.Command, _ []string) error {
 	if err := f.SetupDebug(); err != nil {
 		return fmt.Errorf("failed to setup debug logging: %w", err)
 	}
+	zopts = f.OverrideZapOpts(zopts)
 
 	return nil
 }
 
 func (f *FleetManager) Run(cmd *cobra.Command, args []string) error {
-	// for compatibility, override zap opts with legacy debug opts. remove once manifests are updated.
-	zopts.Development = f.Debug
-	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&zopts)))
+	ctrl.SetLogger(zap.New(zap.UseFlagOptions(zopts)))
 	ctx := clog.IntoContext(cmd.Context(), ctrl.Log)
 
 	kubeconfig := ctrl.GetConfigOrDie()
@@ -136,7 +135,7 @@ func App() *cobra.Command {
 	root.AddCommand(
 		cleanup.App(),
 		agentmanagement.App(),
-		gitops.App(&zopts),
+		gitops.App(zopts),
 	)
 	return root
 }

internal/cmd/debug.go

@@ -7,7 +7,10 @@ import (
 	"fmt"
 
 	"github.com/sirupsen/logrus"
+	"go.uber.org/zap/zapcore"
+
 	"k8s.io/klog/v2"
+	crzap "sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 type DebugConfig struct {
@@ -35,3 +38,18 @@ func (c *DebugConfig) SetupDebug() error {
 
 	return nil
 }
+
+// OverrideZapOpts, for compatibility override zap opts with legacy debug opts.
+func (c *DebugConfig) OverrideZapOpts(zopts *crzap.Options) *crzap.Options {
+	if zopts == nil {
+		zopts = &crzap.Options{}
+	}
+
+	zopts.Development = c.Debug
+
+	if c.Debug && c.DebugLevel > 0 {
+		zopts.Level = zapcore.Level(c.DebugLevel * -1)
+	}
+
+	return zopts
+}