Compare commits

...

3 Commits

Author SHA1 Message Date
Kubernetes Publisher
0d0d5b2832 Fix Godeps.json to point to kubernetes-1.12.3-beta.0 tags 2018-10-26 18:52:17 +00:00
Kubernetes Publisher
13596e875a Merge pull request #69942 from tallclair/automated-cherry-pick-of-#66516-upstream-release-1.12-1539730092
Automated cherry-pick of #66516 to v1.12

Kubernetes-commit: 687c04c53006441ed40f4fa7c09a726cfcec380e
2018-10-26 15:04:22 +00:00
Tim Allclair
32ec4b1882 Only allow apiserver to follow redriects to the same host
Kubernetes-commit: e385ba8c4a0860746e661b39611c88aff5bee5f2
2018-07-23 13:16:25 -07:00
2 changed files with 84 additions and 84 deletions

166
Godeps/Godeps.json generated
View File

@@ -272,335 +272,335 @@
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/apps/v1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta2",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/coordination/v1beta1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/events/v1beta1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/scheduling/v1beta1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/storage/v1alpha1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "b9bd491cc8f21b9461d2a6cf277542dc4c53e7fc"
"Rev": "d14bbb2801ff136e65f37dd9e0ebfb87de68fcc4"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "6dd46049f39503a1fc8d65de4bd566829e95faff"
"Rev": "f71dbbc36e126f5a371b85f6cca96bc8c57db2b6"
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",

View File

@@ -38,7 +38,7 @@ func RoundTripperFor(config *restclient.Config) (http.RoundTripper, Upgrader, er
if err != nil {
return nil, nil, err
}
upgradeRoundTripper := spdy.NewRoundTripper(tlsConfig, true)
upgradeRoundTripper := spdy.NewRoundTripper(tlsConfig, true, false)
wrapper, err := restclient.HTTPWrappersForConfig(config, upgradeRoundTripper)
if err != nil {
return nil, nil, err