github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #67894 from deads2k/server-04-storage

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 67894, 64097). 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>.

remove dead protobuf tags from test

The protobuf tags on this object are deceptive.  The test doesn't actually verify proto and in fact requires using json instead.  This makes for weird errors when you try to "fix" it.

/assign @enj 
@kubernetes/sig-api-machinery-pr-reviews 

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-08-27 13:48:10 -07:00 committed by GitHub
commit d0f42e248c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/integration/etcd/etcd_storage_path_test.go
View File

@ -732,14 +732,14 @@ func getEtcdBucket(path string) string {
// stable fields to compare as a sanity check
type metaObject struct {
// all of type meta
Kind string `json:"kind,omitempty" protobuf:"bytes,1,opt,name=kind"`
APIVersion string `json:"apiVersion,omitempty" protobuf:"bytes,2,opt,name=apiVersion"`
Kind string `json:"kind,omitempty"`
APIVersion string `json:"apiVersion,omitempty"`
// parts of object meta
Metadata struct {
Name string `json:"name,omitempty" protobuf:"bytes,1,opt,name=name"`
Namespace string `json:"namespace,omitempty" protobuf:"bytes,2,opt,name=namespace"`
} `json:"metadata,omitempty" protobuf:"bytes,3,opt,name=metadata"`
Name string `json:"name,omitempty"`
Namespace string `json:"namespace,omitempty"`
} `json:"metadata,omitempty"`
}
func (obj *metaObject) getGVK() schema.GroupVersionKind {