diff --git a/cns/configuration/configuration.go b/cns/configuration/configuration.go index e14c7a4c4b..e468b39d6a 100644 --- a/cns/configuration/configuration.go +++ b/cns/configuration/configuration.go @@ -10,6 +10,7 @@ import ( "github.com/Azure/azure-container-networking/cns" "github.com/Azure/azure-container-networking/cns/logger" + loggerv2 "github.com/Azure/azure-container-networking/cns/logger/v2" "github.com/Azure/azure-container-networking/common" "github.com/pkg/errors" ) @@ -37,6 +38,7 @@ type CNSConfig struct { EnableSwiftV2 bool InitializeFromCNI bool KeyVaultSettings KeyVaultSettings + Logger loggerv2.Config MSISettings MSISettings ManageEndpointState bool ManagedSettings ManagedSettings diff --git a/cns/service/main.go b/cns/service/main.go index 9776ba6bbc..77c1e42bc1 100644 --- a/cns/service/main.go +++ b/cns/service/main.go @@ -67,6 +67,7 @@ import ( "github.com/Azure/azure-container-networking/store" "github.com/Azure/azure-container-networking/telemetry" "github.com/avast/retry-go/v4" + "github.com/go-logr/zapr" "github.com/google/go-cmp/cmp" "github.com/pkg/errors" "go.uber.org/zap" @@ -84,7 +85,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/healthz" - ctrlzap "sigs.k8s.io/controller-runtime/pkg/log/zap" ctrlmgr "sigs.k8s.io/controller-runtime/pkg/manager" ctrlmetrics "sigs.k8s.io/controller-runtime/pkg/metrics/server" ) @@ -629,7 +629,7 @@ func main() { } // build the zap logger - z, c, err := loggerv2.New(&loggerv2.Config{}) + z, c, err := loggerv2.New(&cnsconfig.Logger) defer c() if err != nil { fmt.Printf("failed to create logger: %v", err) @@ -1515,7 +1515,7 @@ func InitializeCRDState(ctx context.Context, z *zap.Logger, httpRestService cns. Scheme: scheme, Metrics: ctrlmetrics.Options{BindAddress: "0"}, Cache: cacheOpts, - Logger: ctrlzap.New(), + Logger: zapr.NewLogger(z), } manager, err := ctrl.NewManager(kubeConfig, managerOpts)