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
36 changes: 6 additions & 30 deletions mesh/v1alpha1/config.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 4 additions & 10 deletions mesh/v1alpha1/config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -1561,16 +1561,6 @@ message MeshConfig {
// For ISTIO_MUTUAL TLS settings, use meshMTLS configuration.
TLSConfig tls_defaults = 64;

// File flush interval for envoy flushes buffers to disk in milliseconds.
// Default is 1000.
// Optional.
uint32 file_flush_interval = 68;

// File flush buffer size for envoy flushes buffers to disk in kilobytes.
// Defaults to 64.
// Optional.
uint32 file_flush_min_size = 69;

// $hide_from_docs
// Next available field number: 70
reserved 1;
Expand Down Expand Up @@ -1611,6 +1601,10 @@ message MeshConfig {
reserved "report_batch_max_entries";
reserved 39;
reserved "report_batch_max_time";
reserved 68;
reserved "file_flush_interval";
reserved 69;
reserved "file_flush_min_size";
}

// Resource describes the source of configuration
Expand Down
44 changes: 22 additions & 22 deletions mesh/v1alpha1/istio.mesh.v1alpha1.pb.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 29 additions & 5 deletions mesh/v1alpha1/proxy.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions mesh/v1alpha1/proxy.proto
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,16 @@ message ProxyConfig {
// This header is disabled by default.
XForwardedPort x_forwarded_port = 42;
}

// File flush interval for envoy flushes buffers to disk in milliseconds.
// Default is 1000.
// Optional.
uint32 file_flush_interval = 40;
Comment on lines +760 to +763
Copy link
Contributor

Choose a reason for hiding this comment

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

Late to the party, but can we have this be a duration rather than a uint32. That way the units expressed as part of the type system and its consistent wtih termination_drain_duration

Copy link
Member Author

Choose a reason for hiding this comment

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

that didn't make sense to me as envoy is base on millisecond.

Copy link
Contributor

Choose a reason for hiding this comment

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

@zirain sure, but we should strive for istio users to not have to know Envoy conventions. Also, Envoy uses google.Protobuf.Duration everywhere in their API. It seems much more ergonomic to use a Duration to express a duration.

Copy link
Member Author

Choose a reason for hiding this comment

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

I didn't have strong option on this, you can raise it up on the WG meeting.

Copy link
Member

Choose a reason for hiding this comment

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

It should be Duration IMO


// File flush buffer size for envoy flushes buffers to disk in kilobytes.
// Defaults to 64.
// Optional.
uint32 file_flush_min_size = 41;
Copy link
Contributor

Choose a reason for hiding this comment

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

}

message RemoteService {
Expand Down