Skip to content

Commit 057b835

Browse files
author
k8s-merge-robot
committed
Merge pull request kubernetes#21182 from vishh/repoTagsRename
Auto commit by PR queue bot
2 parents 4f410d3 + 2623fdd commit 057b835

File tree

14 files changed

+104
-104
lines changed

14 files changed

+104
-104
lines changed

‎api/swagger-spec/v1.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15609,17 +15609,17 @@
1560915609
"id": "v1.ContainerImage",
1561015610
"description": "Describe a container image",
1561115611
"required": [
15612-
"repoTags"
15612+
"names"
1561315613
],
1561415614
"properties": {
15615-
"repoTags": {
15615+
"names": {
1561615616
"type": "array",
1561715617
"items": {
1561815618
"type": "string"
1561915619
},
1562015620
"description": "Names by which this image is known. e.g. [\"gcr.io/google_containers/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]"
1562115621
},
15622-
"size": {
15622+
"sizeBytes": {
1562315623
"type": "integer",
1562415624
"format": "int64",
1562515625
"description": "The size of the image in bytes."

‎docs/api-reference/v1/definitions.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6172,14 +6172,14 @@ <h3 id="_v1_containerimage">v1.ContainerImage</h3>
61726172
</thead>
61736173
<tbody>
61746174
<tr>
6175-
<td class="tableblock halign-left valign-top"><p class="tableblock">repoTags</p></td>
6175+
<td class="tableblock halign-left valign-top"><p class="tableblock">names</p></td>
61766176
<td class="tableblock halign-left valign-top"><p class="tableblock">Names by which this image is known. e.g. ["gcr.io/google_containers/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"]</p></td>
61776177
<td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
61786178
<td class="tableblock halign-left valign-top"><p class="tableblock">string array</p></td>
61796179
<td class="tableblock halign-left valign-top"></td>
61806180
</tr>
61816181
<tr>
6182-
<td class="tableblock halign-left valign-top"><p class="tableblock">size</p></td>
6182+
<td class="tableblock halign-left valign-top"><p class="tableblock">sizeBytes</p></td>
61836183
<td class="tableblock halign-left valign-top"><p class="tableblock">The size of the image in bytes.</p></td>
61846184
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
61856185
<td class="tableblock halign-left valign-top"><p class="tableblock">integer (int64)</p></td>
@@ -7477,7 +7477,7 @@ <h3 id="_any">any</h3>
74777477
</div>
74787478
<div id="footer">
74797479
<div id="footer-text">
7480-
Last updated 2016-02-14 21:22:51 UTC
7480+
Last updated 2016-02-16 23:43:33 UTC
74817481
</div>
74827482
</div>
74837483
</body>

‎pkg/api/deep_copy_generated.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -496,14 +496,14 @@ func DeepCopy_api_Container(in Container, out *Container, c *conversion.Cloner)
496496
}
497497

498498
func DeepCopy_api_ContainerImage(in ContainerImage, out *ContainerImage, c *conversion.Cloner) error {
499-
if in.RepoTags != nil {
500-
in, out := in.RepoTags, &out.RepoTags
499+
if in.Names != nil {
500+
in, out := in.Names, &out.Names
501501
*out = make([]string, len(in))
502502
copy(*out, in)
503503
} else {
504-
out.RepoTags = nil
504+
out.Names = nil
505505
}
506-
out.Size = in.Size
506+
out.SizeBytes = in.SizeBytes
507507
return nil
508508
}
509509

‎pkg/api/types.generated.go

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33754,7 +33754,7 @@ func (x *ContainerImage) CodecEncodeSelf(e *codec1978.Encoder) {
3375433754
var yyq2 [2]bool
3375533755
_, _, _ = yysep2, yyq2, yy2arr2
3375633756
const yyr2 bool = false
33757-
yyq2[1] = x.Size != 0
33757+
yyq2[1] = x.SizeBytes != 0
3375833758
var yynn2 int
3375933759
if yyr2 || yy2arr2 {
3376033760
r.EncodeArrayStart(2)
@@ -33770,28 +33770,28 @@ func (x *ContainerImage) CodecEncodeSelf(e *codec1978.Encoder) {
3377033770
}
3377133771
if yyr2 || yy2arr2 {
3377233772
z.EncSendContainerState(codecSelfer_containerArrayElem1234)
33773-
if x.RepoTags == nil {
33773+
if x.Names == nil {
3377433774
r.EncodeNil()
3377533775
} else {
3377633776
yym4 := z.EncBinary()
3377733777
_ = yym4
3377833778
if false {
3377933779
} else {
33780-
z.F.EncSliceStringV(x.RepoTags, false, e)
33780+
z.F.EncSliceStringV(x.Names, false, e)
3378133781
}
3378233782
}
3378333783
} else {
3378433784
z.EncSendContainerState(codecSelfer_containerMapKey1234)
33785-
r.EncodeString(codecSelferC_UTF81234, string("repoTags"))
33785+
r.EncodeString(codecSelferC_UTF81234, string("names"))
3378633786
z.EncSendContainerState(codecSelfer_containerMapValue1234)
33787-
if x.RepoTags == nil {
33787+
if x.Names == nil {
3378833788
r.EncodeNil()
3378933789
} else {
3379033790
yym5 := z.EncBinary()
3379133791
_ = yym5
3379233792
if false {
3379333793
} else {
33794-
z.F.EncSliceStringV(x.RepoTags, false, e)
33794+
z.F.EncSliceStringV(x.Names, false, e)
3379533795
}
3379633796
}
3379733797
}
@@ -33802,21 +33802,21 @@ func (x *ContainerImage) CodecEncodeSelf(e *codec1978.Encoder) {
3380233802
_ = yym7
3380333803
if false {
3380433804
} else {
33805-
r.EncodeInt(int64(x.Size))
33805+
r.EncodeInt(int64(x.SizeBytes))
3380633806
}
3380733807
} else {
3380833808
r.EncodeInt(0)
3380933809
}
3381033810
} else {
3381133811
if yyq2[1] {
3381233812
z.EncSendContainerState(codecSelfer_containerMapKey1234)
33813-
r.EncodeString(codecSelferC_UTF81234, string("size"))
33813+
r.EncodeString(codecSelferC_UTF81234, string("sizeBytes"))
3381433814
z.EncSendContainerState(codecSelfer_containerMapValue1234)
3381533815
yym8 := z.EncBinary()
3381633816
_ = yym8
3381733817
if false {
3381833818
} else {
33819-
r.EncodeInt(int64(x.Size))
33819+
r.EncodeInt(int64(x.SizeBytes))
3382033820
}
3382133821
}
3382233822
}
@@ -33881,23 +33881,23 @@ func (x *ContainerImage) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
3388133881
yys3 := string(yys3Slc)
3388233882
z.DecSendContainerState(codecSelfer_containerMapValue1234)
3388333883
switch yys3 {
33884-
case "repoTags":
33884+
case "names":
3388533885
if r.TryDecodeAsNil() {
33886-
x.RepoTags = nil
33886+
x.Names = nil
3388733887
} else {
33888-
yyv4 := &x.RepoTags
33888+
yyv4 := &x.Names
3388933889
yym5 := z.DecBinary()
3389033890
_ = yym5
3389133891
if false {
3389233892
} else {
3389333893
z.F.DecSliceStringX(yyv4, false, d)
3389433894
}
3389533895
}
33896-
case "size":
33896+
case "sizeBytes":
3389733897
if r.TryDecodeAsNil() {
33898-
x.Size = 0
33898+
x.SizeBytes = 0
3389933899
} else {
33900-
x.Size = int64(r.DecodeInt(64))
33900+
x.SizeBytes = int64(r.DecodeInt(64))
3390133901
}
3390233902
default:
3390333903
z.DecStructFieldNotFound(-1, yys3)
@@ -33925,9 +33925,9 @@ func (x *ContainerImage) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
3392533925
}
3392633926
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
3392733927
if r.TryDecodeAsNil() {
33928-
x.RepoTags = nil
33928+
x.Names = nil
3392933929
} else {
33930-
yyv8 := &x.RepoTags
33930+
yyv8 := &x.Names
3393133931
yym9 := z.DecBinary()
3393233932
_ = yym9
3393333933
if false {
@@ -33947,9 +33947,9 @@ func (x *ContainerImage) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
3394733947
}
3394833948
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
3394933949
if r.TryDecodeAsNil() {
33950-
x.Size = 0
33950+
x.SizeBytes = 0
3395133951
} else {
33952-
x.Size = int64(r.DecodeInt(64))
33952+
x.SizeBytes = int64(r.DecodeInt(64))
3395333953
}
3395433954
for {
3395533955
yyj7++

‎pkg/api/types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1719,9 +1719,9 @@ type NodeStatus struct {
17191719
// Describe a container image
17201720
type ContainerImage struct {
17211721
// Names by which this image is known.
1722-
RepoTags []string `json:"repoTags"`
1722+
Names []string `json:"names"`
17231723
// The size of the image in bytes.
1724-
Size int64 `json:"size,omitempty"`
1724+
SizeBytes int64 `json:"sizeBytes,omitempty"`
17251725
}
17261726

17271727
type NodePhase string

‎pkg/api/v1/conversion_generated.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -403,15 +403,15 @@ func autoConvert_api_ContainerImage_To_v1_ContainerImage(in *api.ContainerImage,
403403
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
404404
defaulting.(func(*api.ContainerImage))(in)
405405
}
406-
if in.RepoTags != nil {
407-
out.RepoTags = make([]string, len(in.RepoTags))
408-
for i := range in.RepoTags {
409-
out.RepoTags[i] = in.RepoTags[i]
406+
if in.Names != nil {
407+
out.Names = make([]string, len(in.Names))
408+
for i := range in.Names {
409+
out.Names[i] = in.Names[i]
410410
}
411411
} else {
412-
out.RepoTags = nil
412+
out.Names = nil
413413
}
414-
out.Size = in.Size
414+
out.SizeBytes = in.SizeBytes
415415
return nil
416416
}
417417

@@ -3699,15 +3699,15 @@ func autoConvert_v1_ContainerImage_To_api_ContainerImage(in *ContainerImage, out
36993699
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
37003700
defaulting.(func(*ContainerImage))(in)
37013701
}
3702-
if in.RepoTags != nil {
3703-
out.RepoTags = make([]string, len(in.RepoTags))
3704-
for i := range in.RepoTags {
3705-
out.RepoTags[i] = in.RepoTags[i]
3702+
if in.Names != nil {
3703+
out.Names = make([]string, len(in.Names))
3704+
for i := range in.Names {
3705+
out.Names[i] = in.Names[i]
37063706
}
37073707
} else {
3708-
out.RepoTags = nil
3708+
out.Names = nil
37093709
}
3710-
out.Size = in.Size
3710+
out.SizeBytes = in.SizeBytes
37113711
return nil
37123712
}
37133713

‎pkg/api/v1/deep_copy_generated.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -349,15 +349,15 @@ func deepCopy_v1_Container(in Container, out *Container, c *conversion.Cloner) e
349349
}
350350

351351
func deepCopy_v1_ContainerImage(in ContainerImage, out *ContainerImage, c *conversion.Cloner) error {
352-
if in.RepoTags != nil {
353-
out.RepoTags = make([]string, len(in.RepoTags))
354-
for i := range in.RepoTags {
355-
out.RepoTags[i] = in.RepoTags[i]
352+
if in.Names != nil {
353+
out.Names = make([]string, len(in.Names))
354+
for i := range in.Names {
355+
out.Names[i] = in.Names[i]
356356
}
357357
} else {
358-
out.RepoTags = nil
358+
out.Names = nil
359359
}
360-
out.Size = in.Size
360+
out.SizeBytes = in.SizeBytes
361361
return nil
362362
}
363363

‎pkg/api/v1/types.generated.go

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33636,7 +33636,7 @@ func (x *ContainerImage) CodecEncodeSelf(e *codec1978.Encoder) {
3363633636
var yyq2 [2]bool
3363733637
_, _, _ = yysep2, yyq2, yy2arr2
3363833638
const yyr2 bool = false
33639-
yyq2[1] = x.Size != 0
33639+
yyq2[1] = x.SizeBytes != 0
3364033640
var yynn2 int
3364133641
if yyr2 || yy2arr2 {
3364233642
r.EncodeArrayStart(2)
@@ -33652,28 +33652,28 @@ func (x *ContainerImage) CodecEncodeSelf(e *codec1978.Encoder) {
3365233652
}
3365333653
if yyr2 || yy2arr2 {
3365433654
z.EncSendContainerState(codecSelfer_containerArrayElem1234)
33655-
if x.RepoTags == nil {
33655+
if x.Names == nil {
3365633656
r.EncodeNil()
3365733657
} else {
3365833658
yym4 := z.EncBinary()
3365933659
_ = yym4
3366033660
if false {
3366133661
} else {
33662-
z.F.EncSliceStringV(x.RepoTags, false, e)
33662+
z.F.EncSliceStringV(x.Names, false, e)
3366333663
}
3366433664
}
3366533665
} else {
3366633666
z.EncSendContainerState(codecSelfer_containerMapKey1234)
33667-
r.EncodeString(codecSelferC_UTF81234, string("repoTags"))
33667+
r.EncodeString(codecSelferC_UTF81234, string("names"))
3366833668
z.EncSendContainerState(codecSelfer_containerMapValue1234)
33669-
if x.RepoTags == nil {
33669+
if x.Names == nil {
3367033670
r.EncodeNil()
3367133671
} else {
3367233672
yym5 := z.EncBinary()
3367333673
_ = yym5
3367433674
if false {
3367533675
} else {
33676-
z.F.EncSliceStringV(x.RepoTags, false, e)
33676+
z.F.EncSliceStringV(x.Names, false, e)
3367733677
}
3367833678
}
3367933679
}
@@ -33684,21 +33684,21 @@ func (x *ContainerImage) CodecEncodeSelf(e *codec1978.Encoder) {
3368433684
_ = yym7
3368533685
if false {
3368633686
} else {
33687-
r.EncodeInt(int64(x.Size))
33687+
r.EncodeInt(int64(x.SizeBytes))
3368833688
}
3368933689
} else {
3369033690
r.EncodeInt(0)
3369133691
}
3369233692
} else {
3369333693
if yyq2[1] {
3369433694
z.EncSendContainerState(codecSelfer_containerMapKey1234)
33695-
r.EncodeString(codecSelferC_UTF81234, string("size"))
33695+
r.EncodeString(codecSelferC_UTF81234, string("sizeBytes"))
3369633696
z.EncSendContainerState(codecSelfer_containerMapValue1234)
3369733697
yym8 := z.EncBinary()
3369833698
_ = yym8
3369933699
if false {
3370033700
} else {
33701-
r.EncodeInt(int64(x.Size))
33701+
r.EncodeInt(int64(x.SizeBytes))
3370233702
}
3370333703
}
3370433704
}
@@ -33763,23 +33763,23 @@ func (x *ContainerImage) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
3376333763
yys3 := string(yys3Slc)
3376433764
z.DecSendContainerState(codecSelfer_containerMapValue1234)
3376533765
switch yys3 {
33766-
case "repoTags":
33766+
case "names":
3376733767
if r.TryDecodeAsNil() {
33768-
x.RepoTags = nil
33768+
x.Names = nil
3376933769
} else {
33770-
yyv4 := &x.RepoTags
33770+
yyv4 := &x.Names
3377133771
yym5 := z.DecBinary()
3377233772
_ = yym5
3377333773
if false {
3377433774
} else {
3377533775
z.F.DecSliceStringX(yyv4, false, d)
3377633776
}
3377733777
}
33778-
case "size":
33778+
case "sizeBytes":
3377933779
if r.TryDecodeAsNil() {
33780-
x.Size = 0
33780+
x.SizeBytes = 0
3378133781
} else {
33782-
x.Size = int64(r.DecodeInt(64))
33782+
x.SizeBytes = int64(r.DecodeInt(64))
3378333783
}
3378433784
default:
3378533785
z.DecStructFieldNotFound(-1, yys3)
@@ -33807,9 +33807,9 @@ func (x *ContainerImage) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
3380733807
}
3380833808
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
3380933809
if r.TryDecodeAsNil() {
33810-
x.RepoTags = nil
33810+
x.Names = nil
3381133811
} else {
33812-
yyv8 := &x.RepoTags
33812+
yyv8 := &x.Names
3381333813
yym9 := z.DecBinary()
3381433814
_ = yym9
3381533815
if false {
@@ -33829,9 +33829,9 @@ func (x *ContainerImage) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
3382933829
}
3383033830
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
3383133831
if r.TryDecodeAsNil() {
33832-
x.Size = 0
33832+
x.SizeBytes = 0
3383333833
} else {
33834-
x.Size = int64(r.DecodeInt(64))
33834+
x.SizeBytes = int64(r.DecodeInt(64))
3383533835
}
3383633836
for {
3383733837
yyj7++

‎pkg/api/v1/types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2105,9 +2105,9 @@ type NodeStatus struct {
21052105
type ContainerImage struct {
21062106
// Names by which this image is known.
21072107
// e.g. ["gcr.io/google_containers/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"]
2108-
RepoTags []string `json:"repoTags"`
2108+
Names []string `json:"names"`
21092109
// The size of the image in bytes.
2110-
Size int64 `json:"size,omitempty"`
2110+
SizeBytes int64 `json:"sizeBytes,omitempty"`
21112111
}
21122112

21132113
type NodePhase string

0 commit comments

Comments
 (0)