github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18483 from brendandburns/3rdparty3

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-12-16 20:39:09 -08:00
commit ff2f127a9d
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apis/extensions/types.generated.go
View File

@ -4040,7 +4040,7 @@ func (x *ThirdPartyResourceData) CodecEncodeSelf(e *codec1978.Encoder) {
} else { } else {
if yyq328[3] { if yyq328[3] {
z.EncSendContainerState(codecSelfer_containerMapKey1234) z.EncSendContainerState(codecSelfer_containerMapKey1234)
r.EncodeString(codecSelferC_UTF81234, string("name")) r.EncodeString(codecSelferC_UTF81234, string("data"))
z.EncSendContainerState(codecSelfer_containerMapValue1234) z.EncSendContainerState(codecSelfer_containerMapValue1234)
if x.Data == nil { if x.Data == nil {
r.EncodeNil() r.EncodeNil()
@ -4134,7 +4134,7 @@ func (x *ThirdPartyResourceData) codecDecodeSelfFromMap(l int, d *codec1978.Deco
yyv346 := &x.ObjectMeta yyv346 := &x.ObjectMeta
yyv346.CodecDecodeSelf(d) yyv346.CodecDecodeSelf(d)
} }
case "name": case "data":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Data = nil x.Data = nil
} else { } else {

2
pkg/apis/extensions/types.go
View File

@ -182,7 +182,7 @@ type ThirdPartyResourceData struct {
api.ObjectMeta `json:"metadata,omitempty"` api.ObjectMeta `json:"metadata,omitempty"`
// Data is the raw JSON data for this data. // Data is the raw JSON data for this data.
Data []byte `json:"name,omitempty"` Data []byte `json:"data,omitempty"`
} }
type Deployment struct { type Deployment struct {

4
pkg/apis/extensions/v1beta1/types.generated.go
View File

@ -4040,7 +4040,7 @@ func (x *ThirdPartyResourceData) CodecEncodeSelf(e *codec1978.Encoder) {
} else { } else {
if yyq328[3] { if yyq328[3] {
z.EncSendContainerState(codecSelfer_containerMapKey1234) z.EncSendContainerState(codecSelfer_containerMapKey1234)
r.EncodeString(codecSelferC_UTF81234, string("name")) r.EncodeString(codecSelferC_UTF81234, string("data"))
z.EncSendContainerState(codecSelfer_containerMapValue1234) z.EncSendContainerState(codecSelfer_containerMapValue1234)
if x.Data == nil { if x.Data == nil {
r.EncodeNil() r.EncodeNil()
@ -4134,7 +4134,7 @@ func (x *ThirdPartyResourceData) codecDecodeSelfFromMap(l int, d *codec1978.Deco
yyv346 := &x.ObjectMeta yyv346 := &x.ObjectMeta
yyv346.CodecDecodeSelf(d) yyv346.CodecDecodeSelf(d)
} }
case "name": case "data":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Data = nil x.Data = nil
} else { } else {

2
pkg/apis/extensions/v1beta1/types.go
View File

@ -172,7 +172,7 @@ type ThirdPartyResourceData struct {
v1.ObjectMeta `json:"metadata,omitempty"` v1.ObjectMeta `json:"metadata,omitempty"`
// Data is the raw JSON data for this data. // 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. // Deployment enables declarative updates for Pods and ReplicationControllers.

2
pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go
View File

@ -501,7 +501,7 @@ func (ThirdPartyResource) SwaggerDoc() map[string]string {
var map_ThirdPartyResourceData = map[string]string{ var map_ThirdPartyResourceData = map[string]string{
"": "An internal object, used for versioned storage in etcd. Not exposed to the end user.", "": "An internal object, used for versioned storage in etcd. Not exposed to the end user.",
"metadata": "Standard object metadata.", "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 { func (ThirdPartyResourceData) SwaggerDoc() map[string]string {