From 4250c5d3f43bfcf6197c7361dac483a677c22d3d Mon Sep 17 00:00:00 2001
From: Guangya Liu <gyliu513@gmail.com>
Date: Sat, 10 Jun 2017 02:56:19 -0400
Subject: [PATCH] Update client-go.

---
 .../client-go/pkg/api/v1/generated.proto      |  1 -
 .../client-go/pkg/api/v1/types.generated.go   | 33 ++++++++-----------
 .../src/k8s.io/client-go/pkg/api/v1/types.go  |  3 +-
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/generated.proto b/staging/src/k8s.io/client-go/pkg/api/v1/generated.proto
index bfa670b65d..416bd8b250 100644
--- a/staging/src/k8s.io/client-go/pkg/api/v1/generated.proto
+++ b/staging/src/k8s.io/client-go/pkg/api/v1/generated.proto
@@ -379,7 +379,6 @@ message Container {
 
   // Docker image name.
   // More info: https://kubernetes.io/docs/concepts/containers/images
-  // +optional
   optional string image = 2;
 
   // Entrypoint array. Not executed within a shell.
diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/types.generated.go b/staging/src/k8s.io/client-go/pkg/api/v1/types.generated.go
index 9cfb050a47..dc5ef1f52d 100644
--- a/staging/src/k8s.io/client-go/pkg/api/v1/types.generated.go
+++ b/staging/src/k8s.io/client-go/pkg/api/v1/types.generated.go
@@ -28258,7 +28258,6 @@ func (x *Container) CodecEncodeSelf(e *codec1978.Encoder) {
 			var yyq2 [20]bool
 			_, _, _ = yysep2, yyq2, yy2arr2
 			const yyr2 bool = false
-			yyq2[1] = x.Image != ""
 			yyq2[2] = len(x.Command) != 0
 			yyq2[3] = len(x.Args) != 0
 			yyq2[4] = x.WorkingDir != ""
@@ -28281,7 +28280,7 @@ func (x *Container) CodecEncodeSelf(e *codec1978.Encoder) {
 			if yyr2 || yy2arr2 {
 				r.EncodeArrayStart(20)
 			} else {
-				yynn2 = 1
+				yynn2 = 2
 				for _, b := range yyq2 {
 					if b {
 						yynn2++
@@ -28311,27 +28310,21 @@ func (x *Container) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				z.EncSendContainerState(codecSelfer_containerArrayElem1234)
-				if yyq2[1] {
-					yym7 := z.EncBinary()
-					_ = yym7
-					if false {
-					} else {
-						r.EncodeString(codecSelferC_UTF81234, string(x.Image))
-					}
+				yym7 := z.EncBinary()
+				_ = yym7
+				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF81234, "")
+					r.EncodeString(codecSelferC_UTF81234, string(x.Image))
 				}
 			} else {
-				if yyq2[1] {
-					z.EncSendContainerState(codecSelfer_containerMapKey1234)
-					r.EncodeString(codecSelferC_UTF81234, string("image"))
-					z.EncSendContainerState(codecSelfer_containerMapValue1234)
-					yym8 := z.EncBinary()
-					_ = yym8
-					if false {
-					} else {
-						r.EncodeString(codecSelferC_UTF81234, string(x.Image))
-					}
+				z.EncSendContainerState(codecSelfer_containerMapKey1234)
+				r.EncodeString(codecSelferC_UTF81234, string("image"))
+				z.EncSendContainerState(codecSelfer_containerMapValue1234)
+				yym8 := z.EncBinary()
+				_ = yym8
+				if false {
+				} else {
+					r.EncodeString(codecSelferC_UTF81234, string(x.Image))
 				}
 			}
 			if yyr2 || yy2arr2 {
diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/types.go b/staging/src/k8s.io/client-go/pkg/api/v1/types.go
index 04336366aa..ee69b988b3 100644
--- a/staging/src/k8s.io/client-go/pkg/api/v1/types.go
+++ b/staging/src/k8s.io/client-go/pkg/api/v1/types.go
@@ -1721,8 +1721,7 @@ type Container struct {
 	Name string `json:"name" protobuf:"bytes,1,opt,name=name"`
 	// Docker image name.
 	// More info: https://kubernetes.io/docs/concepts/containers/images
-	// +optional
-	Image string `json:"image,omitempty" protobuf:"bytes,2,opt,name=image"`
+	Image string `json:"image" protobuf:"bytes,2,opt,name=image"`
 	// Entrypoint array. Not executed within a shell.
 	// 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