Merge pull request #51321 from mengqiy/kubectl_apply_openapi

Automatic merge from submit-queue (batch tested with PRs 51321, 55969, 55039, 56183, 55976). 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>.

Kubectl apply and strategic merge patch using openapi

- [x] support openapi in strategic merge patch
- [x] test openapi in strategic merge patch
- [x] kubectl apply use openapi to calculate diff be default. It will fall back to use baked-in types when openapi is not available.
- [x] test openapi in kubectl apply

Fixes: kubernetes/kubectl#55

```release-note
kubectl apply use openapi to calculate diff be default. It will fall back to use baked-in types when openapi is not available.
```

/assign @apelisse

Kubernetes-commit: e412ad5393b8c949474b904616fc411c3aa478a9
This commit is contained in:
Kubernetes Publisher 2017-11-22 11:59:49 -08:00
commit d2ae8ddbe0

166
Godeps/Godeps.json generated
View File

@ -372,331 +372,335 @@
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/apps/v1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/storage/v1alpha1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "174ae813538241df9752b353943abe002da8299b"
"Rev": "bc27cbc7921e1343f1320ec077c51729064fc98f"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "8b356a985a4a3415073ed7e5e897c01e374383f6"
"Rev": "f751f89784950a0354a8e96d65e58dd5d44d5bb7"
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/common",
"Rev": "39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1"
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1"
}
]
}