@@ -46,8 +46,8 @@ import (
46
46
" github.com/spf13/pflag"
47
47
cliflag " k8s.io/component-base/cli/flag"
48
48
" k8s.io/component-base/logs"
49
+ logsv1 " k8s.io/component-base/logs/api/v1"
49
50
" k8s.io/klog/v2"
50
- " k8s.io/utils/pointer"
51
51
ctrl " sigs.k8s.io/controller-runtime"
52
52
53
53
runtimecatalog " sigs.k8s.io/cluster-api/exp/runtime/catalog"
@@ -75,7 +75,7 @@ func init() {
75
75
func InitFlags (fs *pflag .FlagSet ) {
76
76
// Initialize logs flags using Kubernetes component-base machinery.
77
77
logs.AddFlags (fs, logs.SkipLoggingConfigurationFlags ())
78
- logOptions .AddFlags (fs)
78
+ logsv1 .AddFlags (logOptions, fs)
79
79
80
80
// Add test-extension specific flags
81
81
fs.StringVar (&profilerAddress, " profiler-address" , " " ,
@@ -99,7 +99,7 @@ func main() {
99
99
pflag.Parse ()
100
100
101
101
// Validates logs flags using Kubernetes component-base machinery and applies them
102
- if err := logOptions .ValidateAndApply (nil ); err != nil {
102
+ if err := logsv1 .ValidateAndApply (logOptions, nil ); err != nil {
103
103
setupLog.Error (err, " unable to start extension" )
104
104
os.Exit (1 )
105
105
}
@@ -128,17 +128,17 @@ func main() {
128
128
129
129
// Register extension handlers.
130
130
if err := webhookServer.AddExtensionHandler (server.ExtensionHandler {
131
- Hook: runtimehooksv1.BeforeClusterCreate ,
132
- Name: " before-cluster-create" ,
133
- HandlerFunc: DoBeforeClusterCreate,
131
+ Hook: runtimehooksv1.BeforeClusterCreate ,
132
+ Name: " before-cluster-create" ,
133
+ HandlerFunc: DoBeforeClusterCreate,
134
134
}); err != nil {
135
135
setupLog.Error (err, " error adding handler" )
136
136
os.Exit (1 )
137
137
}
138
138
if err := webhookServer.AddExtensionHandler (server.ExtensionHandler {
139
- Hook: runtimehooksv1.BeforeClusterUpgrade ,
140
- Name: " before-cluster-upgrade" ,
141
- HandlerFunc: DoBeforeClusterUpgrade,
139
+ Hook: runtimehooksv1.BeforeClusterUpgrade ,
140
+ Name: " before-cluster-upgrade" ,
141
+ HandlerFunc: DoBeforeClusterUpgrade,
142
142
}); err != nil {
143
143
setupLog.Error (err, " error adding handler" )
144
144
os.Exit (1 )
0 commit comments