linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

proxy-api: Expose a flag to control auto-h2-upgrade (#1925) 

When debugging issues, it's helpful to disable HTTP/2 upgrading to
simplify diagnostics.

This chagne adds an `enable-h2-ugprade` flag to _proxy-api_. When this
flag is set to false, the proxy-api will not suggest that meshed
endpoints are upgraded to use HTTP/2.

As a follow-up, a flag should be added to `install` to control how the
proxy-api is initialized.
This commit is contained in:
Oliver Gould 2018-12-05 12:41:20 -08:00 committed by GitHub
parent 380ec52a39
commit 8f9bb711dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
controller/api/proxy/endpoint_listener.go
View File

@ -70,6 +70,7 @@ type endpointListener struct {
stream pb.Destination_GetServer
ownerKindAndName ownerKindAndNameFn
labels map[string]string
enableH2Upgrade bool
enableTLS bool
stopCh chan struct{}
}
@ -77,12 +78,13 @@ type endpointListener struct {
func newEndpointListener(
stream pb.Destination_GetServer,
ownerKindAndName ownerKindAndNameFn,
enableTLS bool,
enableTLS, enableH2Upgrade bool,
) *endpointListener {
return &endpointListener{
stream: stream,
ownerKindAndName: ownerKindAndName,
labels: make(map[string]string),
enableH2Upgrade: enableH2Upgrade,
enableTLS: enableTLS,
stopCh: make(chan struct{}),
}
@ -189,7 +191,7 @@ func (l *endpointListener) getAddrMetadata(pod *coreV1.Pod) (map[string]string,
// does not verify that the pod's control plane matches the control plane
// where the destination service is running; all pods injected for all control
// planes are considered valid for providing the H2 hint.
if controllerNs != "" {
if l.enableH2Upgrade && controllerNs != "" {
hint = &pb.ProtocolHint{
Protocol: &pb.ProtocolHint_H2_{
H2: &pb.ProtocolHint_H2{},

18
controller/api/proxy/server.go
View File

@ -14,9 +14,10 @@ import (
)
type server struct {
k8sAPI *k8s.API
resolvers []streamingDestinationResolver
enableTLS bool
k8sAPI *k8s.API
resolvers []streamingDestinationResolver
enableH2Upgrade bool
enableTLS bool
}
// The proxy-api service serves service discovery and other information to the
@ -29,16 +30,17 @@ type server struct {
//
// Addresses for the given destination are fetched from the Kubernetes Endpoints
// API.
func NewServer(addr, k8sDNSZone string, controllerNamespace string, enableTLS bool, k8sAPI *k8s.API, done chan struct{}) (*grpc.Server, net.Listener, error) {
func NewServer(addr, k8sDNSZone string, controllerNamespace string, enableTLS, enableH2Upgrade bool, k8sAPI *k8s.API, done chan struct{}) (*grpc.Server, net.Listener, error) {
resolvers, err := buildResolversList(k8sDNSZone, controllerNamespace, k8sAPI)
if err != nil {
return nil, nil, err
}
srv := server{
k8sAPI: k8sAPI,
resolvers: resolvers,
enableTLS: enableTLS,
k8sAPI: k8sAPI,
resolvers: resolvers,
enableH2Upgrade: enableH2Upgrade,
enableTLS: enableTLS,
}
lis, err := net.Listen("tcp", addr)
@ -91,7 +93,7 @@ func (s *server) GetProfile(dest *pb.GetDestination, stream pb.Destination_GetPr
}
func (s *server) streamResolutionUsingCorrectResolverFor(host string, port int, stream pb.Destination_GetServer) error {
listener := newEndpointListener(stream, s.k8sAPI.GetOwnerKindAndName, s.enableTLS)
listener := newEndpointListener(stream, s.k8sAPI.GetOwnerKindAndName, s.enableTLS, s.enableH2Upgrade)
for _, resolver := range s.resolvers {
resolverCanResolve, err := resolver.canResolve(host, port)

3
controller/cmd/proxy-api/main.go
View File

@ -18,6 +18,7 @@ func main() {
metricsAddr := flag.String("metrics-addr", ":9996", "address to serve scrapable metrics on")
kubeConfigPath := flag.String("kubeconfig", "", "path to kube config")
k8sDNSZone := flag.String("kubernetes-dns-zone", "", "The DNS suffix for the local Kubernetes zone.")
enableH2Upgrade := flag.Bool("enable-h2-upgrade", true, "Enable transparently upgraded HTTP2 connections among pods in the service mesh")
enableTLS := flag.Bool("enable-tls", false, "Enable TLS connections among pods in the service mesh")
controllerNamespace := flag.String("controller-namespace", "linkerd", "namespace in which Linkerd is installed")
singleNamespace := flag.Bool("single-namespace", false, "only operate in the controller namespace")
@ -53,7 +54,7 @@ func main() {
done := make(chan struct{})
ready := make(chan struct{})
server, lis, err := proxy.NewServer(*addr, *k8sDNSZone, *controllerNamespace, *enableTLS, k8sAPI, done)
server, lis, err := proxy.NewServer(*addr, *k8sDNSZone, *controllerNamespace, *enableTLS, *enableH2Upgrade, k8sAPI, done)
if err != nil {
log.Fatal(err)
}