github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Update client-go.

Browse Source
This commit is contained in:
Guangya Liu 2017-06-10 02:56:19 -04:00
parent 9ecb5d9f4f
commit 4250c5d3f4
3 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
staging/src/k8s.io/client-go/pkg/api/v1/generated.proto
View File

@ -379,7 +379,6 @@ message Container {
// Docker image name. // Docker image name.
// More info: https://kubernetes.io/docs/concepts/containers/images // More info: https://kubernetes.io/docs/concepts/containers/images
// +optional
optional string image = 2; optional string image = 2;
// Entrypoint array. Not executed within a shell. // Entrypoint array. Not executed within a shell.

9
staging/src/k8s.io/client-go/pkg/api/v1/types.generated.go
View File

@ -28258,7 +28258,6 @@ func (x *Container) CodecEncodeSelf(e *codec1978.Encoder) {
var yyq2 [20]bool var yyq2 [20]bool
_, _, _ = yysep2, yyq2, yy2arr2 _, _, _ = yysep2, yyq2, yy2arr2
const yyr2 bool = false const yyr2 bool = false
yyq2[1] = x.Image != ""
yyq2[2] = len(x.Command) != 0 yyq2[2] = len(x.Command) != 0
yyq2[3] = len(x.Args) != 0 yyq2[3] = len(x.Args) != 0
yyq2[4] = x.WorkingDir != "" yyq2[4] = x.WorkingDir != ""
@ -28281,7 +28280,7 @@ func (x *Container) CodecEncodeSelf(e *codec1978.Encoder) {
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
r.EncodeArrayStart(20) r.EncodeArrayStart(20)
} else { } else {
yynn2 = 1 yynn2 = 2
for _, b := range yyq2 { for _, b := range yyq2 {
if b { if b {
yynn2++ yynn2++
@ -28311,7 +28310,6 @@ func (x *Container) CodecEncodeSelf(e *codec1978.Encoder) {
} }
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234) z.EncSendContainerState(codecSelfer_containerArrayElem1234)
if yyq2[1] {
yym7 := z.EncBinary() yym7 := z.EncBinary()
_ = yym7 _ = yym7
if false { if false {
@ -28319,10 +28317,6 @@ func (x *Container) CodecEncodeSelf(e *codec1978.Encoder) {
r.EncodeString(codecSelferC_UTF81234, string(x.Image)) r.EncodeString(codecSelferC_UTF81234, string(x.Image))
} }
} else { } else {
r.EncodeString(codecSelferC_UTF81234, "")
}
} else {
if yyq2[1] {
z.EncSendContainerState(codecSelfer_containerMapKey1234) z.EncSendContainerState(codecSelfer_containerMapKey1234)
r.EncodeString(codecSelferC_UTF81234, string("image")) r.EncodeString(codecSelferC_UTF81234, string("image"))
z.EncSendContainerState(codecSelfer_containerMapValue1234) z.EncSendContainerState(codecSelfer_containerMapValue1234)
@ -28333,7 +28327,6 @@ func (x *Container) CodecEncodeSelf(e *codec1978.Encoder) {
r.EncodeString(codecSelferC_UTF81234, string(x.Image)) r.EncodeString(codecSelferC_UTF81234, string(x.Image))
} }
} }
}
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234) z.EncSendContainerState(codecSelfer_containerArrayElem1234)
if yyq2[2] { if yyq2[2] {

3
staging/src/k8s.io/client-go/pkg/api/v1/types.go
View File

@ -1721,8 +1721,7 @@ type Container struct {
Name string `json:"name" protobuf:"bytes,1,opt,name=name"` Name string `json:"name" protobuf:"bytes,1,opt,name=name"`
// Docker image name. // Docker image name.
// More info: https://kubernetes.io/docs/concepts/containers/images // More info: https://kubernetes.io/docs/concepts/containers/images
// +optional Image string `json:"image" protobuf:"bytes,2,opt,name=image"`
Image string `json:"image,omitempty" protobuf:"bytes,2,opt,name=image"`
// Entrypoint array. Not executed within a shell. // Entrypoint array. Not executed within a shell.
// The docker image's ENTRYPOINT is used if this is not provided. // The docker image's ENTRYPOINT is used if this is not provided.
// Variable references $(VAR_NAME) are expanded using the container's environment. If a variable // Variable references $(VAR_NAME) are expanded using the container's environment. If a variable