From 4bd234b67937b6852a87cdca4236831439b94bd3 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Wed, 9 Dec 2015 16:35:04 -0800 Subject: [PATCH 1/2] Correct a typo in the json/yaml tags for 3rd party objects. --- pkg/apis/extensions/types.go | 2 +- pkg/apis/extensions/v1beta1/types.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/apis/extensions/types.go b/pkg/apis/extensions/types.go index 147c47ffba0..2330ad43401 100644 --- a/pkg/apis/extensions/types.go +++ b/pkg/apis/extensions/types.go @@ -182,7 +182,7 @@ type ThirdPartyResourceData struct { api.ObjectMeta `json:"metadata,omitempty"` // Data is the raw JSON data for this data. - Data []byte `json:"name,omitempty"` + Data []byte `json:"data,omitempty"` } type Deployment struct { diff --git a/pkg/apis/extensions/v1beta1/types.go b/pkg/apis/extensions/v1beta1/types.go index d41c252679b..be868a3aca1 100644 --- a/pkg/apis/extensions/v1beta1/types.go +++ b/pkg/apis/extensions/v1beta1/types.go @@ -172,7 +172,7 @@ type ThirdPartyResourceData struct { v1.ObjectMeta `json:"metadata,omitempty"` // Data is the raw JSON data for this data. - Data []byte `json:"name,omitempty"` + Data []byte `json:"data,omitempty"` } // Deployment enables declarative updates for Pods and ReplicationControllers. From 9f7199d5bbf1053a68bab1b290728b528e446a0a Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Wed, 9 Dec 2015 16:37:46 -0800 Subject: [PATCH 2/2] Clean up some dead code. --- pkg/apis/extensions/types.generated.go | 4 ++-- pkg/apis/extensions/v1beta1/types.generated.go | 4 ++-- pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/apis/extensions/types.generated.go b/pkg/apis/extensions/types.generated.go index 6817cf5cd00..3427244c2ee 100644 --- a/pkg/apis/extensions/types.generated.go +++ b/pkg/apis/extensions/types.generated.go @@ -4040,7 +4040,7 @@ func (x *ThirdPartyResourceData) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyq328[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("name")) + r.EncodeString(codecSelferC_UTF81234, string("data")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Data == nil { r.EncodeNil() @@ -4134,7 +4134,7 @@ func (x *ThirdPartyResourceData) codecDecodeSelfFromMap(l int, d *codec1978.Deco yyv346 := &x.ObjectMeta yyv346.CodecDecodeSelf(d) } - case "name": + case "data": if r.TryDecodeAsNil() { x.Data = nil } else { diff --git a/pkg/apis/extensions/v1beta1/types.generated.go b/pkg/apis/extensions/v1beta1/types.generated.go index d1dc0ec124d..305c02d5eb5 100644 --- a/pkg/apis/extensions/v1beta1/types.generated.go +++ b/pkg/apis/extensions/v1beta1/types.generated.go @@ -4040,7 +4040,7 @@ func (x *ThirdPartyResourceData) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyq328[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("name")) + r.EncodeString(codecSelferC_UTF81234, string("data")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Data == nil { r.EncodeNil() @@ -4134,7 +4134,7 @@ func (x *ThirdPartyResourceData) codecDecodeSelfFromMap(l int, d *codec1978.Deco yyv346 := &x.ObjectMeta yyv346.CodecDecodeSelf(d) } - case "name": + case "data": if r.TryDecodeAsNil() { x.Data = nil } else { diff --git a/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go b/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go index af309f5c338..97755ca0f99 100644 --- a/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go +++ b/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go @@ -481,7 +481,7 @@ func (ThirdPartyResource) SwaggerDoc() map[string]string { var map_ThirdPartyResourceData = map[string]string{ "": "An internal object, used for versioned storage in etcd. Not exposed to the end user.", "metadata": "Standard object metadata.", - "name": "Data is the raw JSON data for this data.", + "data": "Data is the raw JSON data for this data.", } func (ThirdPartyResourceData) SwaggerDoc() map[string]string {