kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #67635 from nikhita/customresource-subresource-patch-04 

Automatic merge from submit-queue (batch tested with PRs 67298, 67518, 67635, 67673). 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>.

Fix unstructured metadata accessors to respect omitempty semantics

Fixes #67541
Fixes #48211
Fixes #49075
Follow up of #67562

`ObjectMeta` has fields with `omitempty` json tags. This means that when the fields have zero values, they should not be persisted in the object.

Before this PR, some of the metadata accessors for unstructured objects did not respect these semantics i.e they would persist a field even if it had a zero value.

This PR updates the accessors so that the field is removed from the unstructured object map if it contains a zero value.

/sig api-machinery
/kind bug
/area custom-resources
/cc sttts liggitt yue9944882 roycaihw
/assign sttts liggitt

**Release note**:

```release-note
NONE
```

Kubernetes-commit: ce8a6285dfa0bcc96e6f8ef0e21ef40f958930c7
This commit is contained in:
Kubernetes Publisher 2018-08-21 18:33:07 -07:00
parent 3f04333002 4e2bd91334
commit b75a0686c5
2 changed files with 98 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

252
Godeps/Godeps.json generated
View File

@ -856,339 +856,339 @@
},
{
"ImportPath": "k8s.io/api/admission/v1beta1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/apps/v1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/coordination/v1beta1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/events/v1beta1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/scheduling/v1beta1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/storage/v1alpha1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "167b5831ed2b510b117579b94ed5302f2b6736c4"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/validation",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/validation/path",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/rand",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/uuid",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/waitgroup",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
"Rev": "d4e5f596ea6e79f9493060696ad6025c6c82599d"
},
{
"ImportPath": "k8s.io/client-go/discovery",
@ -1198,6 +1198,10 @@
"ImportPath": "k8s.io/client-go/discovery/fake",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/informers",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/informers/admissionregistration",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
@ -1370,6 +1374,10 @@
"ImportPath": "k8s.io/client-go/kubernetes",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/fake",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/scheme",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
@ -1758,6 +1766,10 @@
"ImportPath": "k8s.io/client-go/tools/cache",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd/api",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
@ -1838,78 +1850,6 @@
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
"Rev": "0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803"
},
{
"ImportPath": "k8s.io/client-go/discovery",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/informers",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/kubernetes",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/fake",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/scheme",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/listers/admissionregistration/v1beta1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/listers/core/v1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/rest",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/testing",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/tools/cache",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd/api",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd/api/v1",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/util/cert",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/client-go/util/flowcontrol",
"Rev": "3a923191144267df15e72beacff80dda1773fe87"
},
{
"ImportPath": "k8s.io/utils/pointer",
"Rev": "66066c83e385e385ccc3c964b44fd7dcd413d0ed"

4
pkg/registry/generic/registry/dryrun_test.go
View File

@ -215,7 +215,7 @@ func TestDryRunUpdateReturnsObject(t *testing.T) {
if err != nil {
t.Fatalf("Failed to dry-run update: %v", err)
}
out = UnstructuredOrDie(`{"field": "value", "kind": "Pod", "metadata": {"resourceVersion": "2", "selfLink": ""}}`)
out = UnstructuredOrDie(`{"field": "value", "kind": "Pod", "metadata": {"resourceVersion": "2"}}`)
if !reflect.DeepEqual(obj, out) {
t.Fatalf("Returned object %#v different from expected %#v", obj, out)
}
@ -268,7 +268,7 @@ func TestDryRunDeleteReturnsObject(t *testing.T) {
}
out = UnstructuredOrDie(`{}`)
expected := UnstructuredOrDie(`{"kind": "Pod", "metadata": {"resourceVersion": "2", "selfLink": ""}}`)
expected := UnstructuredOrDie(`{"kind": "Pod", "metadata": {"resourceVersion": "2"}}`)
err = s.Delete(context.Background(), "key", out, nil, true)
if err != nil {
t.Fatalf("Failed to delete with valid precondition: %v", err)