Merge pull request #65849 from CaoShuFeng/debuggingRoundTripper

Automatic merge from submit-queue (batch tested with PRs 65771, 65849). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix kube-aggregator dailer Fixes: https://github.com/kubernetes/kubernetes/issues/65848 **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #65849 from CaoShuFeng/debuggingRoundTripper
d08e68e7 · Kubernetes Submit Queue · GitHub · d2cc34fb · dc07d27d · d08e68e7
Unverified Commit d08e68e7 authored Jul 19, 2018 by Kubernetes Submit Queue Committed by GitHub Jul 19, 2018
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

handler_proxy.go ...src/k8s.io/kube-aggregator/pkg/apiserver/handler_proxy.go +4 -8

No files found.
--- a/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_proxy.go
+++ b/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_proxy.go
@@ -18,7 +18,6 @@ package apiserver
 import (
 	"context"
-	"fmt"
 	"net/http"
 	"net/url"
 	"sync/atomic"
@@ -208,15 +207,12 @@ func (r *proxyHandler) updateAPIService(apiService *apiregistrationapi.APIServic
 		serviceNamespace: apiService.Spec.Service.Namespace,
 		serviceAvailable: apiregistrationapi.IsAPIServiceConditionTrue(apiService, apiregistrationapi.Available),
 	}
+	if r.proxyTransport != nil && r.proxyTransport.DialContext != nil {
+		newInfo.restConfig.Dial = r.proxyTransport.DialContext
+	}
 	newInfo.proxyRoundTripper, newInfo.transportBuildingError = restclient.TransportFor(newInfo.restConfig)
-	if newInfo.transportBuildingError == nil && r.proxyTransport != nil && r.proxyTransport.DialContext != nil {
+	if newInfo.transportBuildingError != nil {
-		switch transport := newInfo.proxyRoundTripper.(type) {
-		case *http.Transport:
-			transport.DialContext = r.proxyTransport.DialContext
-		default:
-			newInfo.transportBuildingError = fmt.Errorf("unable to set dialer for %s/%s as rest transport is of type %T", apiService.Spec.Service.Namespace, apiService.Spec.Service.Name, newInfo.proxyRoundTripper)
 		glog.Warning(newInfo.transportBuildingError.Error())
 	}
-	}
 	r.handlingInfo.Store(newInfo)
 }