status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use protocol from resolved config entry, not gateway service

This commit is contained in:
Kyle Havlovitz 2022-07-12 16:09:35 -07:00
parent 7162e3bde2
commit 7d0c692374
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
agent/proxycfg/testing_terminating_gateway.go
View File

@ -642,9 +642,8 @@ func TestConfigSnapshotTerminatingGatewayHTTP2(t testing.T) *ConfigSnapshot {
Result: &structs.IndexedGatewayServices{
Services: []*structs.GatewayService{
{
Service: web,
CAFile: "ca.cert.pem",
Protocol: "http2",
Service: web,
CAFile: "ca.cert.pem",
},
},
},
@ -703,9 +702,8 @@ func TestConfigSnapshotTerminatingGatewaySubsetsHTTP2(t testing.T) *ConfigSnapsh
Result: &structs.IndexedGatewayServices{
Services: []*structs.GatewayService{
{
Service: web,
CAFile: "ca.cert.pem",
Protocol: "http2",
Service: web,
CAFile: "ca.cert.pem",
},
},
},

14
agent/xds/clusters.go
View File

@ -425,8 +425,18 @@ func (s *ResourceGenerator) makeGatewayServiceClusters(
}
clusters = append(clusters, cluster)
gatewaySvc, ok := cfgSnap.TerminatingGateway.GatewayServices[svc]
isHTTP2 := ok && (gatewaySvc.Protocol == "http2" || gatewaySvc.Protocol == "grpc")
svcConfig, ok := cfgSnap.TerminatingGateway.ServiceConfigs[svc]
isHTTP2 := false
if ok {
upstreamCfg, err := structs.ParseUpstreamConfig(svcConfig.ProxyConfig)
if err != nil {
// Don't hard fail on a config typo, just warn. The parse func returns
// default config if there is an error so it's safe to continue.
s.Logger.Warn("failed to parse", "upstream", svc, "error", err)
}
isHTTP2 = upstreamCfg.Protocol == "http2" || upstreamCfg.Protocol == "grpc"
}
if isHTTP2 {
if err := s.setHttp2ProtocolOptions(cluster); err != nil {
return nil, err