Skip to content

logging: route controller-runtime binaries through slog (retire zap) #535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Philip Lombardi (plombardi89) wants to merge 4 commits into
base: main
Choose a base branch
from
Open

logging: route controller-runtime binaries through slog (retire zap) #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b02481b
operator: log via slog instead of zap
plombardi89 Jul 22, 2026
db2d7f6
logging: route remaining controller-runtime binaries through slog
plombardi89 Jul 22, 2026
c2b32f6
Merge branch 'main' into operator-slog-logger
plombardi89 Jul 22, 2026
6806a8a
Merge branch 'main' into operator-slog-logger
plombardi89 Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cmd/machina/machina/controller/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ package controller
import (
"context"
"fmt"
"log/slog"

"github.com/go-logr/logr"
certificatesv1 "k8s.io/api/certificates/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -18,7 +20,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/cache"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

unboundedv1alpha3 "github.com/Azure/unbounded/api/machina/v1alpha3"
Expand All @@ -35,7 +36,7 @@ func init() {

// RunManager runs the controller manager.
func RunManager(ctx context.Context, cfg Config) error {
ctrl.SetLogger(zap.New(zap.UseDevMode(true)))
ctrl.SetLogger(logr.FromSlogHandler(slog.Default().Handler()))

mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
Scheme: scheme,
Expand Down
5 changes: 3 additions & 2 deletions cmd/machine-ops-controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,19 @@ import (
"encoding/hex"
"errors"
"fmt"
"log/slog"
"os"
"os/signal"
"strings"
"syscall"

"github.com/go-logr/logr"
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

unboundedv1alpha3 "github.com/Azure/unbounded/api/machina/v1alpha3"
Expand Down Expand Up @@ -86,7 +87,7 @@ type config struct {
}

func run(ctx context.Context, cfg config) error {
ctrl.SetLogger(zap.New(zap.UseDevMode(true)))
ctrl.SetLogger(logr.FromSlogHandler(slog.Default().Handler()))

if (cfg.siteName == "") != (cfg.providerName == "") {
return errors.New(errSiteProviderPair)
Expand Down
5 changes: 3 additions & 2 deletions cmd/playpen-operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ package main
import (
"context"
"fmt"
"log/slog"
"os"
"os/signal"
"syscall"

"github.com/go-logr/logr"
"github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand All @@ -19,7 +21,6 @@ import (
apiregclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

"github.com/Azure/unbounded/internal/playpen/operator"
"github.com/Azure/unbounded/internal/version"
Expand Down Expand Up @@ -91,7 +92,7 @@ func main() {
}

func run(ctx context.Context, cfg operator.Config) error {
ctrl.SetLogger(zap.New(zap.UseDevMode(true)))
ctrl.SetLogger(logr.FromSlogHandler(slog.Default().Handler()))

scheme := runtimeScheme()
restConfig := ctrl.GetConfigOrDie()
Expand Down
9 changes: 7 additions & 2 deletions cmd/unbounded-operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ package main
import (
"context"
"fmt"
"log/slog"
"os"
"os/signal"
"strconv"
"syscall"

"github.com/go-logr/logr"
"github.com/spf13/cobra"
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
appsv1 "k8s.io/api/apps/v1"
Expand All @@ -25,7 +27,6 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

unboundedv1alpha3 "github.com/Azure/unbounded/api/machina/v1alpha3"
Expand Down Expand Up @@ -140,7 +141,11 @@ func resolveAPIServerEndpoint(ctx context.Context, override string, clientset ku
}

func run(ctx context.Context, cfg config) error {
ctrl.SetLogger(zap.New(zap.UseDevMode(true)))
// Route controller-runtime's logr logging through slog, consistent with the
// rest of the repo (metalman, agent). slog.Default() is an Info-level
// handler, so logr V(1)+ maps to sub-Info slog levels and is suppressed by
// default.
Comment on lines +144 to +147
ctrl.SetLogger(logr.FromSlogHandler(slog.Default().Handler()))

scheme := runtimeScheme()

Expand Down
5 changes: 3 additions & 2 deletions e2e/operator/reaper_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"encoding/json"
"errors"
"fmt"
"log/slog"
"net"
"os"
"os/exec"
Expand All @@ -30,6 +31,7 @@ import (
"testing"
"time"

"github.com/go-logr/logr"
appsv1 "k8s.io/api/apps/v1"
authenticationv1 "k8s.io/api/authentication/v1"
authorizationv1 "k8s.io/api/authorization/v1"
Expand All @@ -52,7 +54,6 @@ import (
"k8s.io/client-go/util/retry"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

unboundedv1alpha3 "github.com/Azure/unbounded/api/machina/v1alpha3"
netcontroller "github.com/Azure/unbounded/internal/net/controller"
Expand Down Expand Up @@ -128,7 +129,7 @@ func TestOperatorReaperMigration(t *testing.T) {
applyCRDs(t, kubeconfig, repoRoot)

cli := newClient(t, kubeconfig)
ctx := log.IntoContext(context.Background(), zap.New(zap.UseDevMode(true)))
ctx := log.IntoContext(context.Background(), logr.FromSlogHandler(slog.Default().Handler()))

stageNamespaces(ctx, t, cli)
stageLegacyWorkloads(ctx, t, cli)
Expand Down
5 changes: 3 additions & 2 deletions e2e/operator/slice_window_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ package operatore2e
import (
"context"
"fmt"
"log/slog"
"net"
"testing"
"time"

"github.com/go-logr/logr"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -25,7 +27,6 @@ import (
utilwait "k8s.io/apimachinery/pkg/util/wait"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
)

const sliceWindowClusterName = "operator-slice-window-e2e"
Expand Down Expand Up @@ -57,7 +58,7 @@ func TestSiteControllerPreservesSlicesDuringMigrationWindow(t *testing.T) {
applyCRDs(t, kubeconfig, repoRoot)

cli := newClient(t, kubeconfig)
ctx := log.IntoContext(context.Background(), zap.New(zap.UseDevMode(true)))
ctx := log.IntoContext(context.Background(), logr.FromSlogHandler(slog.Default().Handler()))

// The restricted SiteController identity's ServiceAccount lives in targetNS.
mustCreate(ctx, t, cli, &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: targetNS}})
Expand Down
1 change: 0 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ require (
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
Comment on lines 149 to 152

@plombardi89 Philip Lombardi (plombardi89) Jul 22, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

go mod tidy was run and both files already reflect its output - go mod tidy -diff reports no pending changes, so CI's tidy-check passes as-is.

go.sum keeps github.com/go-logr/zapr on purpose: it is still in the module graph via sigs.k8s.io/controller-runtime@v0.24.1, which requires zapr in its own go.mod (go mod graph shows sigs.k8s.io/controller-runtime@v0.24.1 github.com/go-logr/zapr@v1.3.0). go.sum must carry checksums for every module in the graph, not just direct requirements. What changed here is only that zapr is no longer a direct dependency, so it correctly leaves the go.mod require block while its go.sum checksums remain. Removing those lines manually would make go mod tidy re-add them and fail the tidy-check.

github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
Expand Down
Loading