Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up some dead code and fix some typos. #18483

Merged
merged 2 commits into from
Dec 17, 2015
Merged

Clean up some dead code and fix some typos. #18483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bd234b
Correct a typo in the json/yaml tags for 3rd party objects.
brendandburns Dec 10, 2015
9f7199d
Clean up some dead code.
brendandburns Dec 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/apis/extensions/types.generated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/extensions/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/extensions/v1beta1/types.generated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/extensions/v1beta1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down