Merge pull request kubernetes#98841 from caesarxuchao/fix-98479

k8s-ci-robot · web-flow · commit d51f243c26ab · 2021-03-09T04:27:20.000-08:00
Make proxy Transport return metav1.Status error
diff --git a/staging/src/k8s.io/apimachinery/pkg/util/proxy/transport.go b/staging/src/k8s.io/apimachinery/pkg/util/proxy/transport.go
@@ -32,6 +32,7 @@ import (
 	"golang.org/x/net/html/atom"
 	"k8s.io/klog/v2"
 
+	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/util/net"
 	"k8s.io/apimachinery/pkg/util/sets"
 )
@@ -101,7 +102,7 @@ func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
 	resp, err := rt.RoundTrip(req)
 
 	if err != nil {
-		return nil, fmt.Errorf("error trying to reach service: %w", err)
+		return nil, errors.NewServiceUnavailable(fmt.Sprintf("error trying to reach service: %v", err))
 	}
 
 	if redirect := resp.Header.Get("Location"); redirect != "" {

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ import (`
`32`	`32`	`"golang.org/x/net/html/atom"`
`33`	`33`	`"k8s.io/klog/v2"`
`34`	`34`
	`35`	`+ "k8s.io/apimachinery/pkg/api/errors"`
`35`	`36`	`"k8s.io/apimachinery/pkg/util/net"`
`36`	`37`	`"k8s.io/apimachinery/pkg/util/sets"`
`37`	`38`	`)`
`@@ -101,7 +102,7 @@ func (t Transport) RoundTrip(req http.Request) (*http.Response, error) {`
`101`	`102`	`resp, err := rt.RoundTrip(req)`
`102`	`103`
`103`	`104`	`if err != nil {`
`104`		`- return nil, fmt.Errorf("error trying to reach service: %w", err)`
	`105`	`+ return nil, errors.NewServiceUnavailable(fmt.Sprintf("error trying to reach service: %v", err))`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`if redirect := resp.Header.Get("Location"); redirect != "" {`