Skip to content
This repository was archived by the owner on Aug 12, 2025. It is now read-only.

Commit cccdca7

Browse files
committed
Updated component-base/logs instead of old logging style
1 parent 5cbcfd4 commit cccdca7

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV
129129
github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
130130
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
131131
github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A=
132+
github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4=
132133
github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
133134
github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
134135
github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
@@ -418,6 +419,7 @@ go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/
418419
go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
419420
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
420421
go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8=
422+
go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
421423
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
422424
golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
423425
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

main.go

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ import (
3636
ctrl "sigs.k8s.io/controller-runtime"
3737
"sigs.k8s.io/controller-runtime/pkg/controller"
3838

39+
"k8s.io/component-base/logs"
40+
logsv1 "k8s.io/component-base/logs/api/v1"
41+
_ "k8s.io/component-base/logs/json/register"
3942
infrav1alpha3 "sigs.k8s.io/cluster-api-provider-packet/api/v1alpha3"
4043
infrav1beta1 "sigs.k8s.io/cluster-api-provider-packet/api/v1beta1"
4144
"sigs.k8s.io/cluster-api-provider-packet/controllers"
@@ -44,8 +47,9 @@ import (
4447
)
4548

4649
var (
47-
scheme = runtime.NewScheme()
48-
setupLog = ctrl.Log.WithName("setup")
50+
scheme = runtime.NewScheme()
51+
setupLog = ctrl.Log.WithName("setup")
52+
logOptions = logs.NewOptions()
4953
)
5054

5155
func init() {
@@ -54,7 +58,6 @@ func init() {
5458
utilruntime.Must(infrav1beta1.AddToScheme(scheme))
5559
utilruntime.Must(clusterv1.AddToScheme(scheme))
5660
utilruntime.Must(bootstrapv1.AddToScheme(scheme))
57-
5861
// +kubebuilder:scaffold:scheme
5962
}
6063

@@ -81,6 +84,11 @@ func main() {
8184
pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
8285
pflag.Parse()
8386

87+
if err := logsv1.ValidateAndApply(logOptions, nil); err != nil {
88+
setupLog.Error(err, "unable to start manager")
89+
os.Exit(1)
90+
}
91+
8492
if watchNamespace != "" {
8593
setupLog.Info("Watching cluster-api objects only in namespace for reconciliation", "namespace", watchNamespace)
8694
}
@@ -284,4 +292,7 @@ func initFlags(fs *pflag.FlagSet) {
284292
":9440",
285293
"The address the health endpoint binds to.",
286294
)
295+
296+
logs.AddFlags(fs, logs.SkipLoggingConfigurationFlags())
297+
logsv1.AddFlags(logOptions, fs)
287298
}

0 commit comments

Comments
 (0)