Merge remote-tracking branch 'origin/master' into release-1.12

Kubernetes-commit: 5f6008cadc6e03bf1c84cae2ef4c239d2a111006
This commit is contained in:
Kubernetes Publisher
2018-08-22 17:10:27 -07:00
8 changed files with 151 additions and 86 deletions
+72 -72
View File
@@ -172,291 +172,291 @@
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/apps/v1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/coordination/v1beta1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/events/v1beta1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/scheduling/v1beta1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/storage/v1alpha1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "26126332928c1e87bfc67cba88ac813d6841e11e"
"Rev": "888fc6f3af54763c859f0ad7e7e78597e915c703"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "86945f533ab271363f1d115341faadf66ccfe311"
"Rev": "bdc400e77b66d73117cdee65710783efca9a45f0"
},
{
"ImportPath": "k8s.io/client-go/discovery",