Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions api/v1alpha1/envoyproxy_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,11 @@ func (logging *ProxyLogging) GetEnvoyProxyComponentLevel() string {
}
}

if len(args) == 0 {
// use "misc:error" as default
args = []string{"misc:error"}
}

sort.Strings(args)

return strings.Join(args, ",")
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/validation/envoyproxy_validate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -847,15 +847,15 @@ func TestGetEnvoyProxyComponentLevelArgs(t *testing.T) {
}{
{
logging: egv1a1.ProxyLogging{},
expected: "",
expected: "misc:error",
},
{
logging: egv1a1.ProxyLogging{
Level: map[egv1a1.ProxyLogComponent]egv1a1.LogLevel{
egv1a1.LogComponentDefault: egv1a1.LogLevelInfo,
},
},
expected: "",
expected: "misc:error",
},
{
logging: egv1a1.ProxyLogging{
Expand Down
3 changes: 0 additions & 3 deletions internal/infrastructure/common/proxy_args.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@ func BuildProxyArgs(

if componentsLogLevel := logging.GetEnvoyProxyComponentLevel(); componentsLogLevel != "" {
args = append(args, fmt.Sprintf("--component-log-level %s", componentsLogLevel))
} else {
// Default to error level for misc components if not set.
args = append(args, fmt.Sprintf("--component-log-level %s", "misc:error"))
}

// Default drain timeout.
Expand Down
Loading