diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 70ade600a0..7b58c82cb7 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -47260,7 +47260,8 @@ "io.k8s.kubernetes.pkg.api.v1.Container": { "description": "A single application container that you want to run within a pod.", "required": [ - "name" + "name", + "image" ], "properties": { "args": { diff --git a/api/swagger-spec/apps_v1beta1.json b/api/swagger-spec/apps_v1beta1.json index 2a6e7d973e..a95df12347 100644 --- a/api/swagger-spec/apps_v1beta1.json +++ b/api/swagger-spec/apps_v1beta1.json @@ -4842,7 +4842,8 @@ "id": "v1.Container", "description": "A single application container that you want to run within a pod.", "required": [ - "name" + "name", + "image" ], "properties": { "name": { diff --git a/api/swagger-spec/batch_v1.json b/api/swagger-spec/batch_v1.json index 429b0b3e6f..916667489b 100644 --- a/api/swagger-spec/batch_v1.json +++ b/api/swagger-spec/batch_v1.json @@ -2589,7 +2589,8 @@ "id": "v1.Container", "description": "A single application container that you want to run within a pod.", "required": [ - "name" + "name", + "image" ], "properties": { "name": { diff --git a/api/swagger-spec/batch_v2alpha1.json b/api/swagger-spec/batch_v2alpha1.json index e2ee18fcd1..6b1029c976 100644 --- a/api/swagger-spec/batch_v2alpha1.json +++ b/api/swagger-spec/batch_v2alpha1.json @@ -3670,7 +3670,8 @@ "id": "v1.Container", "description": "A single application container that you want to run within a pod.", "required": [ - "name" + "name", + "image" ], "properties": { "name": { diff --git a/api/swagger-spec/extensions_v1beta1.json b/api/swagger-spec/extensions_v1beta1.json index 384c198a2b..c5146f53e5 100644 --- a/api/swagger-spec/extensions_v1beta1.json +++ b/api/swagger-spec/extensions_v1beta1.json @@ -8314,7 +8314,8 @@ "id": "v1.Container", "description": "A single application container that you want to run within a pod.", "required": [ - "name" + "name", + "image" ], "properties": { "name": { diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index 84fa687715..3df69b91c8 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -20159,7 +20159,8 @@ "id": "v1.Container", "description": "A single application container that you want to run within a pod.", "required": [ - "name" + "name", + "image" ], "properties": { "name": { diff --git a/docs/api-reference/apps/v1beta1/definitions.html b/docs/api-reference/apps/v1beta1/definitions.html index 6b682a60b2..d6ad36f2cc 100755 --- a/docs/api-reference/apps/v1beta1/definitions.html +++ b/docs/api-reference/apps/v1beta1/definitions.html @@ -5373,7 +5373,7 @@ Examples:

image

Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images

-

false

+

true

string

@@ -6807,7 +6807,7 @@ Examples:
diff --git a/docs/api-reference/batch/v1/definitions.html b/docs/api-reference/batch/v1/definitions.html index 45d334c537..87d0ab9e73 100755 --- a/docs/api-reference/batch/v1/definitions.html +++ b/docs/api-reference/batch/v1/definitions.html @@ -4337,7 +4337,7 @@ Examples:

image

Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images

-

false

+

true

string

@@ -5788,7 +5788,7 @@ Examples:
diff --git a/docs/api-reference/batch/v2alpha1/definitions.html b/docs/api-reference/batch/v2alpha1/definitions.html index 08849bb0bb..0134798c53 100755 --- a/docs/api-reference/batch/v2alpha1/definitions.html +++ b/docs/api-reference/batch/v2alpha1/definitions.html @@ -4344,7 +4344,7 @@ Examples:

image

Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images

-

false

+

true

string

@@ -5884,7 +5884,7 @@ Examples:
diff --git a/docs/api-reference/extensions/v1beta1/definitions.html b/docs/api-reference/extensions/v1beta1/definitions.html index 23d0c2eaab..4d2e0d0689 100755 --- a/docs/api-reference/extensions/v1beta1/definitions.html +++ b/docs/api-reference/extensions/v1beta1/definitions.html @@ -6242,7 +6242,7 @@ Both these may change in the future. Incoming requests are matched against the h

image

Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images

-

false

+

true

string

@@ -8224,7 +8224,7 @@ Both these may change in the future. Incoming requests are matched against the h diff --git a/docs/api-reference/v1/definitions.html b/docs/api-reference/v1/definitions.html index f3c19db96c..9d5bf98e4d 100755 --- a/docs/api-reference/v1/definitions.html +++ b/docs/api-reference/v1/definitions.html @@ -7104,7 +7104,7 @@ Examples:

image

Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images

-

false

+

true

string

@@ -10250,7 +10250,7 @@ Examples:
diff --git a/federation/apis/openapi-spec/swagger.json b/federation/apis/openapi-spec/swagger.json index 9816f96888..382c8c5d63 100644 --- a/federation/apis/openapi-spec/swagger.json +++ b/federation/apis/openapi-spec/swagger.json @@ -10778,7 +10778,8 @@ "io.k8s.kubernetes.pkg.api.v1.Container": { "description": "A single application container that you want to run within a pod.", "required": [ - "name" + "name", + "image" ], "properties": { "args": { diff --git a/federation/apis/swagger-spec/extensions_v1beta1.json b/federation/apis/swagger-spec/extensions_v1beta1.json index 4e6ea69e4a..94270932c9 100644 --- a/federation/apis/swagger-spec/extensions_v1beta1.json +++ b/federation/apis/swagger-spec/extensions_v1beta1.json @@ -6058,7 +6058,8 @@ "id": "v1.Container", "description": "A single application container that you want to run within a pod.", "required": [ - "name" + "name", + "image" ], "properties": { "name": { diff --git a/federation/docs/api-reference/extensions/v1beta1/definitions.html b/federation/docs/api-reference/extensions/v1beta1/definitions.html index 555cde5f61..09ff76fffa 100755 --- a/federation/docs/api-reference/extensions/v1beta1/definitions.html +++ b/federation/docs/api-reference/extensions/v1beta1/definitions.html @@ -5664,7 +5664,7 @@ Both these may change in the future. Incoming requests are matched against the h

image

Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images

-

false

+

true

string

@@ -7294,7 +7294,7 @@ Both these may change in the future. Incoming requests are matched against the h diff --git a/pkg/api/v1/generated.proto b/pkg/api/v1/generated.proto index d7eee2b528..c022cb1ba1 100644 --- a/pkg/api/v1/generated.proto +++ b/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/pkg/api/v1/types.generated.go b/pkg/api/v1/types.generated.go index 9cfb050a47..dc5ef1f52d 100644 --- a/pkg/api/v1/types.generated.go +++ b/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 {