Skip to content

Commit 1010e06

Browse files
committed
fix(flags): handle log streams correctly for default stderr, file-only, and file+stderr logging.
(fixes #7842)
1 parent 7b9cb8c commit 1010e06

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

cluster-autoscaler/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ require (
220220
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.4 // indirect
221221
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
222222
sigs.k8s.io/randfill v1.0.0 // indirect
223-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
224223
sigs.k8s.io/structured-merge-diff/v6 v6.2.0 // indirect
225224
)
226225

cluster-autoscaler/go.sum

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
227227
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
228228
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
229229
github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
230-
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
231230
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
232231
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
233232
github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
@@ -662,13 +661,9 @@ sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.4 h1:CFMHYo6/OQp
662661
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.4/go.mod h1:PvXgFxPcfve6yBiWNIO/fqAMvGVC9W7qN6M2vIj4zmY=
663662
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
664663
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
665-
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
666664
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
667665
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
668-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
669-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
670666
sigs.k8s.io/structured-merge-diff/v6 v6.2.0 h1:msyqjP8Nyd5sF3QSmJouFSzcBIdwq4ct8d1/7VSBHIQ=
671667
sigs.k8s.io/structured-merge-diff/v6 v6.2.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
672-
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
673668
sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
674669
sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=

cluster-autoscaler/main.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,13 @@ func main() {
332332
}
333333

334334
logs.InitLogs()
335-
if err := logsapi.ValidateAndApply(loggingConfig, featureGate); err != nil {
335+
336+
opts, err := flags.ComputeLoggingOptions(pflag.CommandLine)
337+
if err != nil {
338+
klog.Fatalf("Failed to configure logging: %v", err)
339+
}
340+
341+
if err := logsapi.ValidateAndApplyWithOptions(loggingConfig, opts, featureGate); err != nil {
336342
klog.Fatalf("Failed to validate and apply logging configuration: %v", err)
337343
}
338344

@@ -421,6 +427,9 @@ func leaderElectionConfiguration() componentbaseconfig.LeaderElectionConfigurati
421427
}
422428
}
423429

430+
431+
432+
424433
const (
425434
defaultLeaseDuration = 15 * time.Second
426435
defaultRenewDeadline = 10 * time.Second

0 commit comments

Comments
 (0)