Skip to content

Commit d380969

Browse files
FedosinFedosin
committed
Fix breaking changes introduced in v1.25
All log config methods became functions in v1.25: kubernetes/component-base@41262c3
1 parent c1b9f42 commit d380969

File tree

5 files changed

+15
-10
lines changed

5 files changed

+15
-10
lines changed

‎bootstrap/kubeadm/main.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import (
3535
"k8s.io/client-go/tools/leaderelection/resourcelock"
3636
cliflag "k8s.io/component-base/cli/flag"
3737
"k8s.io/component-base/logs"
38+
logapiv1 "k8s.io/component-base/logs/api/v1"
3839
_ "k8s.io/component-base/logs/json/register"
3940
"k8s.io/klog/v2"
4041
ctrl "sigs.k8s.io/controller-runtime"
@@ -90,7 +91,7 @@ var (
9091
// InitFlags initializes this manager's flags.
9192
func InitFlags(fs *pflag.FlagSet) {
9293
logs.AddFlags(fs, logs.SkipLoggingConfigurationFlags())
93-
logOptions.AddFlags(fs)
94+
logapiv1.AddFlags(logOptions, fs)
9495

9596
fs.StringVar(&metricsBindAddr, "metrics-bind-addr", "localhost:8080",
9697
"The address the metric endpoint binds to.")
@@ -145,7 +146,7 @@ func main() {
145146
pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
146147
pflag.Parse()
147148

148-
if err := logOptions.ValidateAndApply(nil); err != nil {
149+
if err := logapiv1.ValidateAndApply(logOptions, nil); err != nil {
149150
setupLog.Error(err, "unable to start manager")
150151
os.Exit(1)
151152
}

‎controlplane/kubeadm/main.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import (
3737
"k8s.io/client-go/tools/leaderelection/resourcelock"
3838
cliflag "k8s.io/component-base/cli/flag"
3939
"k8s.io/component-base/logs"
40+
logapiv1 "k8s.io/component-base/logs/api/v1"
4041
_ "k8s.io/component-base/logs/json/register"
4142
"k8s.io/klog/v2"
4243
ctrl "sigs.k8s.io/controller-runtime"
@@ -94,7 +95,7 @@ var (
9495
// InitFlags initializes the flags.
9596
func InitFlags(fs *pflag.FlagSet) {
9697
logs.AddFlags(fs, logs.SkipLoggingConfigurationFlags())
97-
logOptions.AddFlags(fs)
98+
logapiv1.AddFlags(logOptions, fs)
9899

99100
fs.StringVar(&metricsBindAddr, "metrics-bind-addr", "localhost:8080",
100101
"The address the metric endpoint binds to.")
@@ -148,7 +149,7 @@ func main() {
148149
pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
149150
pflag.Parse()
150151

151-
if err := logOptions.ValidateAndApply(nil); err != nil {
152+
if err := logapiv1.ValidateAndApply(logOptions, nil); err != nil {
152153
setupLog.Error(err, "unable to start manager")
153154
os.Exit(1)
154155
}

‎main.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import (
3636
"k8s.io/client-go/tools/leaderelection/resourcelock"
3737
cliflag "k8s.io/component-base/cli/flag"
3838
"k8s.io/component-base/logs"
39+
logapiv1 "k8s.io/component-base/logs/api/v1"
3940
_ "k8s.io/component-base/logs/json/register"
4041
"k8s.io/klog/v2"
4142
ctrl "sigs.k8s.io/controller-runtime"
@@ -129,7 +130,7 @@ func init() {
129130
// InitFlags initializes the flags.
130131
func InitFlags(fs *pflag.FlagSet) {
131132
logs.AddFlags(fs, logs.SkipLoggingConfigurationFlags())
132-
logOptions.AddFlags(fs)
133+
logapiv1.AddFlags(logOptions, fs)
133134

134135
fs.StringVar(&metricsBindAddr, "metrics-bind-addr", "localhost:8080",
135136
"The address the metric endpoint binds to.")
@@ -208,7 +209,7 @@ func main() {
208209
pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
209210
pflag.Parse()
210211

211-
if err := logOptions.ValidateAndApply(nil); err != nil {
212+
if err := logapiv1.ValidateAndApply(logOptions, nil); err != nil {
212213
setupLog.Error(err, "unable to start manager")
213214
os.Exit(1)
214215
}

‎test/extension/main.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"k8s.io/apimachinery/pkg/runtime"
2929
cliflag "k8s.io/component-base/cli/flag"
3030
"k8s.io/component-base/logs"
31+
logapiv1 "k8s.io/component-base/logs/api/v1"
3132
"k8s.io/klog/v2"
3233
"k8s.io/utils/pointer"
3334
ctrl "sigs.k8s.io/controller-runtime"
@@ -65,7 +66,7 @@ func init() {
6566
// InitFlags initializes the flags.
6667
func InitFlags(fs *pflag.FlagSet) {
6768
logs.AddFlags(fs, logs.SkipLoggingConfigurationFlags())
68-
logOptions.AddFlags(fs)
69+
logapiv1.AddFlags(logOptions, fs)
6970

7071
fs.StringVar(&profilerAddress, "profiler-address", "",
7172
"Bind address to expose the pprof profiler (e.g. localhost:6060)")
@@ -83,7 +84,7 @@ func main() {
8384
pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
8485
pflag.Parse()
8586

86-
if err := logOptions.ValidateAndApply(nil); err != nil {
87+
if err := logapiv1.ValidateAndApply(logOptions, nil); err != nil {
8788
setupLog.Error(err, "unable to start extension")
8889
os.Exit(1)
8990
}

‎test/infrastructure/docker/main.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
"k8s.io/client-go/tools/leaderelection/resourcelock"
3535
cliflag "k8s.io/component-base/cli/flag"
3636
"k8s.io/component-base/logs"
37+
logapiv1 "k8s.io/component-base/logs/api/v1"
3738
_ "k8s.io/component-base/logs/json/register"
3839
"k8s.io/klog/v2"
3940
ctrl "sigs.k8s.io/controller-runtime"
@@ -85,7 +86,7 @@ func init() {
8586

8687
func initFlags(fs *pflag.FlagSet) {
8788
logs.AddFlags(fs, logs.SkipLoggingConfigurationFlags())
88-
logOptions.AddFlags(fs)
89+
logapiv1.AddFlags(logOptions, fs)
8990

9091
fs.StringVar(&metricsBindAddr, "metrics-bind-addr", "localhost:8080",
9192
"The address the metric endpoint binds to.")
@@ -119,7 +120,7 @@ func main() {
119120
pflag.CommandLine.SetNormalizeFunc(cliflag.WordSepNormalizeFunc)
120121
pflag.Parse()
121122

122-
if err := logOptions.ValidateAndApply(nil); err != nil {
123+
if err := logapiv1.ValidateAndApply(logOptions, nil); err != nil {
123124
setupLog.Error(err, "unable to start manager")
124125
os.Exit(1)
125126
}

0 commit comments

Comments
 (0)