Skip to content

Commit 47c9783

Browse files
hrakhrak
committed
Use component-base for logging options
add webhook TLS flags as suggested in CAPI v1.2-to-v1.3 migration guide
1 parent 276166f commit 47c9783

File tree

3 files changed

+29
-5
lines changed

3 files changed

+29
-5
lines changed

‎go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ require (
1919
k8s.io/api v0.26.1
2020
k8s.io/apimachinery v0.26.1
2121
k8s.io/client-go v0.26.1
22+
k8s.io/component-base v0.26.1
2223
k8s.io/klog/v2 v2.80.1
2324
k8s.io/utils v0.0.0-20230711102312-30195339c3c7
2425
sigs.k8s.io/cluster-api v1.4.6
@@ -54,6 +55,7 @@ require (
5455
github.com/google/uuid v1.3.0 // indirect
5556
github.com/hashicorp/errwrap v1.0.0 // indirect
5657
github.com/imdario/mergo v0.3.13 // indirect
58+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
5759
github.com/josharian/intern v1.0.0 // indirect
5860
github.com/json-iterator/go v1.1.12 // indirect
5961
github.com/mailru/easyjson v0.7.7 // indirect
@@ -66,6 +68,7 @@ require (
6668
github.com/prometheus/common v0.42.0 // indirect
6769
github.com/prometheus/procfs v0.10.1 // indirect
6870
github.com/rogpeppe/go-internal v1.9.0 // indirect
71+
github.com/spf13/cobra v1.6.1 // indirect
6972
go.uber.org/atomic v1.10.0 // indirect
7073
golang.org/x/net v0.13.0 // indirect
7174
golang.org/x/oauth2 v0.6.0 // indirect
@@ -80,7 +83,6 @@ require (
8083
gopkg.in/yaml.v2 v2.4.0 // indirect
8184
k8s.io/apiextensions-apiserver v0.26.1 // indirect
8285
k8s.io/cluster-bootstrap v0.25.3 // indirect
83-
k8s.io/component-base v0.26.1 // indirect
8486
k8s.io/kube-openapi v0.0.0-20221106113015-f73e7dbcfe29 // indirect
8587
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
8688
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect

‎go.sum

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee
6464
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
6565
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
6666
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
67+
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
6768
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
6869
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
6970
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -205,6 +206,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:
205206
github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
206207
github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
207208
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
209+
github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
210+
github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
208211
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
209212
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
210213
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
@@ -298,6 +301,7 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
298301
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
299302
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
300303
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
304+
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
301305
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
302306
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
303307
github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
@@ -313,6 +317,8 @@ github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B
313317
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
314318
github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
315319
github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo=
320+
github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
321+
github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
316322
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
317323
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
318324
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=

‎main.go

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"os"
2424
"time"
2525

26+
"k8s.io/klog/v2"
2627
"k8s.io/klog/v2/klogr"
2728

2829
flag "github.com/spf13/pflag"
@@ -31,7 +32,10 @@ import (
3132
goflag "flag"
3233

3334
_ "k8s.io/client-go/plugin/pkg/client/auth"
34-
"k8s.io/klog/v2"
35+
cliflag "k8s.io/component-base/cli/flag"
36+
"k8s.io/component-base/logs"
37+
logsv1 "k8s.io/component-base/logs/api/v1"
38+
"sigs.k8s.io/cluster-api/util/flags"
3539

3640
"k8s.io/apimachinery/pkg/runtime"
3741
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -54,9 +58,14 @@ import (
5458
var (
5559
scheme = runtime.NewScheme()
5660
setupLog = ctrl.Log.WithName("setup")
61+
62+
tlsOptions = flags.TLSOptions{}
63+
logOptions = logs.NewOptions()
5764
)
5865

5966
func init() {
67+
klog.InitFlags(nil)
68+
6069
utilruntime.Must(clientgoscheme.AddToScheme(scheme))
6170
utilruntime.Must(clusterv1.AddToScheme(scheme))
6271
utilruntime.Must(infrav1b1.AddToScheme(scheme))
@@ -138,11 +147,18 @@ func setFlags() *managerOpts {
138147
}
139148

140149
func main() {
141-
opts := setFlags() // Add our options to flag set.
142-
klog.InitFlags(nil) // Add klog options to flag set.
143-
flag.CommandLine.AddGoFlagSet(goflag.CommandLine) // Merge klog's gofloag flags into the pflags.
150+
opts := setFlags() // Add our options to flag set.
151+
logsv1.AddFlags(logOptions, flag.CommandLine)
152+
flags.AddTLSOptions(flag.CommandLine, &tlsOptions)
153+
flag.CommandLine.SetNormalizeFunc(cliflag.WordSepNormalizeFunc)
154+
flag.CommandLine.AddGoFlagSet(goflag.CommandLine) // Merge klog's goflag flags into the pflags.
144155
flag.Parse()
145156

157+
if err := logsv1.ValidateAndApply(logOptions, nil); err != nil {
158+
setupLog.Error(err, "unable to start manager")
159+
os.Exit(1)
160+
}
161+
146162
ctrl.SetLogger(klogr.New())
147163

148164
// Create the controller manager.

0 commit comments

Comments
 (0)