mirror of
https://github.com/kubernetes/sample-controller.git
synced 2025-02-13 01:53:00 +08:00
a1cbb76b5c
Automatic merge from submit-queue (batch tested with PRs 65946, 65904, 65913, 65906, 65920). 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>. track schemes by name for error reporting Getting an error message about a type not being in the scheme is hard to fix if you don't know which scheme is failing. This adds a name to the scheme which can be set during creation or can be set based on the calling stack. If you use the old constructor a name is generated for you based on the stack. Something like "k8s.io/client-go/dynamic/scheme.go:28" for instance. Also moves a typer to its point of use. This was debt from previous refactors which I noticed going through. @kubernetes/sig-api-machinery-misc @sttts ```release-note NONE ``` Kubernetes-commit: 8e2fdb32bc84103b15310a221a375470bf567bdc
51 lines
1.5 KiB
Go
51 lines
1.5 KiB
Go
/*
|
|
Copyright 2017 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package discovery
|
|
|
|
import (
|
|
"net/http"
|
|
"path/filepath"
|
|
|
|
"github.com/gregjones/httpcache"
|
|
"github.com/gregjones/httpcache/diskcache"
|
|
"github.com/peterbourgon/diskv"
|
|
)
|
|
|
|
type cacheRoundTripper struct {
|
|
rt *httpcache.Transport
|
|
}
|
|
|
|
// newCacheRoundTripper creates a roundtripper that reads the ETag on
|
|
// response headers and send the If-None-Match header on subsequent
|
|
// corresponding requests.
|
|
func newCacheRoundTripper(cacheDir string, rt http.RoundTripper) http.RoundTripper {
|
|
d := diskv.New(diskv.Options{
|
|
BasePath: cacheDir,
|
|
TempDir: filepath.Join(cacheDir, ".diskv-temp"),
|
|
})
|
|
t := httpcache.NewTransport(diskcache.NewWithDiskv(d))
|
|
t.Transport = rt
|
|
|
|
return &cacheRoundTripper{rt: t}
|
|
}
|
|
|
|
func (rt *cacheRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
|
|
return rt.rt.RoundTrip(req)
|
|
}
|
|
|
|
func (rt *cacheRoundTripper) WrappedRoundTripper() http.RoundTripper { return rt.rt.Transport }
|