mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
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 ```
This commit is contained in:
commit
d08e68e759
@ -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 {
|
||||
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())
|
||||
}
|
||||
if newInfo.transportBuildingError != nil {
|
||||
glog.Warning(newInfo.transportBuildingError.Error())
|
||||
}
|
||||
r.handlingInfo.Store(newInfo)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user