Skip to content

K
k3s
Unverified Commit d0f42e24 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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

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 ```
parents 52994701 a66b438b
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
test/integration/etcd/etcd_storage_path_test.go
View file @ d0f42e24
......@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment