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

Add default connection pool parameters for generated cnames #257

Merged
merged 4 commits into from
Sep 1, 2022
Merged

Add default connection pool parameters for generated cnames #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e38f4c
added default connection pool to DR
shriramsharma Aug 31, 2022
c0bddbc
Update admiral/pkg/clusters/handler.go
shriramsharma Aug 31, 2022
b53217b
fixed typo
shriramsharma Aug 31, 2022
3fcbe16
modified the LB policy to LEAST_REQUEST
shriramsharma Sep 1, 2022
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
21 changes: 19 additions & 2 deletions admiral/pkg/clusters/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ const (
DefaultBaseEjectionTime int64 = 300
DefaultConsecutiveGatewayErrors uint32 = 50
DefaultInterval int64 = 60
DefaultHTTP2MaxRequests int32 = 1000
DefaultMaxRequestsPerConnection int32 = 100
)

// ServiceEntryHandler responsible for handling Add/Update/Delete events for
Expand Down Expand Up @@ -85,15 +87,30 @@ func getDestinationRule(se *v1alpha32.ServiceEntry, locality string, gtpTrafficP
dr = &v1alpha32.DestinationRule{}
)
dr.Host = se.Hosts[0]
dr.TrafficPolicy = &v1alpha32.TrafficPolicy{Tls: &v1alpha32.ClientTLSSettings{Mode: v1alpha32.ClientTLSSettings_ISTIO_MUTUAL}}
dr.TrafficPolicy = &v1alpha32.TrafficPolicy{
Tls: &v1alpha32.ClientTLSSettings{
Mode: v1alpha32.ClientTLSSettings_ISTIO_MUTUAL,
},
ConnectionPool: &v1alpha32.ConnectionPoolSettings{
Http: &v1alpha32.ConnectionPoolSettings_HTTPSettings{
Http2MaxRequests: DefaultHTTP2MaxRequests,
MaxRequestsPerConnection: DefaultMaxRequestsPerConnection,
},
},
LoadBalancer: &v1alpha32.LoadBalancerSettings{
LbPolicy: &v1alpha32.LoadBalancerSettings_Simple{
Simple: v1alpha32.LoadBalancerSettings_LEAST_REQUEST,
},
},
}

if len(locality) == 0 {
log.Warnf(LogErrFormat, "Process", "GlobalTrafficPolicy", dr.Host, "", "Skipping gtp processing, locality of the cluster nodes cannot be determined. Is this minikube?")
processGtp = false
}
if gtpTrafficPolicy != nil && processGtp {
var loadBalancerSettings = &v1alpha32.LoadBalancerSettings{
LbPolicy: &v1alpha32.LoadBalancerSettings_Simple{Simple: v1alpha32.LoadBalancerSettings_ROUND_ROBIN},
LbPolicy: &v1alpha32.LoadBalancerSettings_Simple{Simple: v1alpha32.LoadBalancerSettings_LEAST_REQUEST},
}

if len(gtpTrafficPolicy.Target) > 0 {
Expand Down
34 changes: 31 additions & 3 deletions admiral/pkg/clusters/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,23 @@ func TestGetDestinationRule(t *testing.T) {
Interval: &duration.Duration{Seconds: 60},
MaxEjectionPercent: 100,
}
mTLS := &v1alpha3.TrafficPolicy{Tls: &v1alpha3.ClientTLSSettings{Mode: v1alpha3.ClientTLSSettings_ISTIO_MUTUAL}, OutlierDetection: outlierDetection}
mTLS := &v1alpha3.TrafficPolicy{
Tls: &v1alpha3.ClientTLSSettings{
Mode: v1alpha3.ClientTLSSettings_ISTIO_MUTUAL,
},
OutlierDetection: outlierDetection,
ConnectionPool: &v1alpha3.ConnectionPoolSettings{
Http: &v1alpha3.ConnectionPoolSettings_HTTPSettings{
Http2MaxRequests: DefaultHTTP2MaxRequests,
MaxRequestsPerConnection: DefaultMaxRequestsPerConnection,
},
},
LoadBalancer: &v1alpha3.LoadBalancerSettings{
LbPolicy: &v1alpha3.LoadBalancerSettings_Simple{
Simple: v1alpha3.LoadBalancerSettings_LEAST_REQUEST,
},
},
}

se := &v1alpha3.ServiceEntry{Hosts: []string{"qa.myservice.global"}, Endpoints: []*v1alpha3.WorkloadEntry{
{Address: "east.com", Locality: "us-east-2"}, {Address: "west.com", Locality: "us-west-2"},
Expand All @@ -195,10 +211,16 @@ func TestGetDestinationRule(t *testing.T) {
TrafficPolicy: &v1alpha3.TrafficPolicy{
Tls: &v1alpha3.ClientTLSSettings{Mode: v1alpha3.ClientTLSSettings_ISTIO_MUTUAL},
LoadBalancer: &v1alpha3.LoadBalancerSettings{
LbPolicy: &v1alpha3.LoadBalancerSettings_Simple{Simple: v1alpha3.LoadBalancerSettings_ROUND_ROBIN},
LbPolicy: &v1alpha3.LoadBalancerSettings_Simple{Simple: v1alpha3.LoadBalancerSettings_LEAST_REQUEST},
LocalityLbSetting: &v1alpha3.LocalityLoadBalancerSetting{},
},
OutlierDetection: outlierDetection,
ConnectionPool: &v1alpha3.ConnectionPoolSettings{
Http: &v1alpha3.ConnectionPoolSettings_HTTPSettings{
Http2MaxRequests: DefaultHTTP2MaxRequests,
MaxRequestsPerConnection: DefaultMaxRequestsPerConnection,
},
},
},
}

Expand All @@ -207,7 +229,7 @@ func TestGetDestinationRule(t *testing.T) {
TrafficPolicy: &v1alpha3.TrafficPolicy{
Tls: &v1alpha3.ClientTLSSettings{Mode: v1alpha3.ClientTLSSettings_ISTIO_MUTUAL},
LoadBalancer: &v1alpha3.LoadBalancerSettings{
LbPolicy: &v1alpha3.LoadBalancerSettings_Simple{Simple: v1alpha3.LoadBalancerSettings_ROUND_ROBIN},
LbPolicy: &v1alpha3.LoadBalancerSettings_Simple{Simple: v1alpha3.LoadBalancerSettings_LEAST_REQUEST},
LocalityLbSetting: &v1alpha3.LocalityLoadBalancerSetting{
Distribute: []*v1alpha3.LocalityLoadBalancerSetting_Distribute{
{
Expand All @@ -218,6 +240,12 @@ func TestGetDestinationRule(t *testing.T) {
},
},
OutlierDetection: outlierDetection,
ConnectionPool: &v1alpha3.ConnectionPoolSettings{
Http: &v1alpha3.ConnectionPoolSettings_HTTPSettings{
Http2MaxRequests: DefaultHTTP2MaxRequests,
MaxRequestsPerConnection: DefaultMaxRequestsPerConnection,
},
},
},
}

Expand Down