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
3 changes: 3 additions & 0 deletions internal/infrastructure/common/proxy_args.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ 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.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be moved to

func (logging *ProxyLogging) GetEnvoyProxyComponentLevel() string {
?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

both are fine to me, I change send a follow up if you want.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure that would be great if we can keep the source of truth of defaults inside GetEnvoyProxyComponentLevel rather than in the caller

args = append(args, fmt.Sprintf("--component-log-level %s", "misc:error"))
}

// Default drain timeout.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 30
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ spec:
- --cpuset-threads
- --drain-strategy immediate
- --concurrency 4
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
- --key1 val1
- --key2 val2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 30
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ spec:
- --cpuset-threads
- --drain-strategy immediate
- --concurrency 4
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
- --key1 val1
- --key2 val2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down Expand Up @@ -697,6 +698,7 @@ spec:
- --log-level warn
- --cpuset-threads
- --drain-strategy immediate
- --component-log-level misc:error
- --drain-time-s 60
command:
- envoy
Expand Down