Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integrate IstioControlPlaneSpec with MeshConfig #1101

Closed
wants to merge 6 commits into from
Closed

Integrate IstioControlPlaneSpec with MeshConfig #1101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5ca4217
Integrate IstioControlPlaneSpec with MeshConfig
ostromart Sep 24, 2019
3a34778
Review comments
ostromart Sep 25, 2019
363a70c
Second attempt to merge protos
ostromart Oct 1, 2019
8aa869d
Review comments
ostromart Oct 2, 2019
2d87521
K8s spelling
ostromart Oct 3, 2019
d0a6e0d
Updated based on TOC review
ostromart Oct 8, 2019
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
30 changes: 25 additions & 5 deletions mesh/v1alpha1/config.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ message MeshConfig {
// It can be enabled by destination using the destinationRule.trafficPolicy.connectionPool.http.h2UpgradePolicy override.
H2UpgradePolicy h2_upgrade_policy = 41;

// Name to be used while emitting statistics for inbound clusters.
// Name to be used while emitting statistics for inbound clusters.
// By default, Istio emits statistics with the pattern inbound|<port>|<port-name>|<service-FQDN>.
// For example inbound|7443|grpc-reviews|reviews.prod.svc.cluster.local. This can be used to override that pattern.
//
Expand All @@ -340,13 +340,13 @@ message MeshConfig {
// %SERVICE_FQDN% - Will be substituted with FQDN of the service.
// %SERVICE_PORT% - Will be substituted with port of the service.
// %SERVICE_PORT_NAME% - Will be substituted with port name of the service.
//
//
// Following are some examples of supported patterns for reviews.
// %SERVICE_FQDN%_%SERVICE_PORT% will use reviews.prod.svc.cluster.local_7443 as the stats name.
// %SERVICE% will use reviews.prod as the stats name.
string inbound_cluster_stat_name = 44;

// Name to be used while emitting statistics for outbound clusters.
// Name to be used while emitting statistics for outbound clusters.
// By default, Istio emits statistics with the pattern outbound|<port>|<subsetname>|<service-FQDN>.
// For example outbound|8080|v2|reviews.prod.svc.cluster.local. This can be used to override that pattern.
//
Expand All @@ -356,14 +356,18 @@ message MeshConfig {
// %SERVICE_PORT% - Will be substituted with port of the service.
// %SERVICE_PORT_NAME% - Will be substituted with port name of the service.
// %SUBSET_NAME% - Will be substituted with subset.
//
//
// Following are some examples of supported patterns for reviews.
// %SERVICE_FQDN%_%SERVICE_PORT% will use reviews.prod.svc.cluster.local_7443 as the stats name.
// %SERVICE% will use reviews.prod as the stats name.
string outbound_cluster_stat_name = 45;

TrafficManagementFeatureSpec traffic_management = 46;
PolicyFeatureSpec policy = 47;
TelemetryFeatureSpec telemetry = 48;
SecurityFeatureSpec security = 49;
// $hide_from_docs
// Next available field number: 46
// Next available field number: 47
}

// Resource describes the source of configuration
Expand Down Expand Up @@ -483,3 +487,19 @@ message LocalityLoadBalancerSetting{
// Note: if no OutlierDetection specified, this will not take effect.
repeated Failover failover = 2;
}

// Configuration options for traffic management.
message TrafficManagementFeatureSpec {
Copy link
Contributor

Choose a reason for hiding this comment

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

Rather than creating empty messages can we move a few fields into each of these (or rather copy them over to do the migration)?

Or if we don't want to do that yet maybe leave MeshConfig alone and have this PR just clean up control plane spec?

}

// Configuration options for the policy feature.
message PolicyFeatureSpec {
}

// Configuration options for the telemetry feature.
message TelemetryFeatureSpec {
}

// Configuration options for security feature.
message SecurityFeatureSpec {
}
Loading