Merge pull request #63635 from roycaihw/release-1.8

Automatic merge from submit-queue.

Manual cherrypick of kube-openapi changes for release-1.8

**What this PR does / why we need it**:
Cherry-picks kubernetes/kube-openapi#64 and kubernetes/kube-openapi#67
Fixes bugs that make apiserver panic when aggregating valid but not well formed OpenAPI spec (with empty `Paths`/`Definitions`)

**Release note**:

```release-note
Fixes bugs that make apiserver panic when aggregating valid but not well formed OpenAPI spec
```

/cc @jpbetz
/sig api-machinery

Kubernetes-commit: 4ab16f7d4499fcb3b770b1260fa33855632c7e44
This commit is contained in:
Kubernetes Publisher
2018-05-10 10:03:32 -07:00

146
Godeps/Godeps.json generated
View File

@@ -376,295 +376,295 @@
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "389dfa299845bcf399c16af89987e8775718ea48"
"Rev": "a315a049e7a93e5455f7fefce1ba136d85054687"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "4972c8e335e32ab65ba45bde0a99c6544c8a8e4c"
"Rev": "40eaf68ee1889b1da1c528b1a075ecfe94e66837"
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/common",
"Rev": "868f2f29720b192240e18284659231b440f9cda5"
"Rev": "0c329704159e3b051aafac400b15baacf2a94a04"
}
]
}