From e31bcb97c6aa0e147dfcdee7943da2787f3f91fa Mon Sep 17 00:00:00 2001 From: Guangya Liu Date: Wed, 20 Sep 2017 00:15:24 -0400 Subject: [PATCH] Generated code. --- api/openapi-spec/swagger.json | 5 ++--- api/swagger-spec/apps_v1beta1.json | 5 ++--- api/swagger-spec/apps_v1beta2.json | 5 ++--- api/swagger-spec/batch_v1.json | 5 ++--- api/swagger-spec/batch_v1beta1.json | 5 ++--- api/swagger-spec/batch_v2alpha1.json | 5 ++--- api/swagger-spec/extensions_v1beta1.json | 5 ++--- api/swagger-spec/v1.json | 5 ++--- docs/api-reference/apps/v1beta1/definitions.html | 4 ++-- docs/api-reference/apps/v1beta2/definitions.html | 4 ++-- docs/api-reference/batch/v1/definitions.html | 4 ++-- docs/api-reference/batch/v1beta1/definitions.html | 4 ++-- docs/api-reference/batch/v2alpha1/definitions.html | 4 ++-- docs/api-reference/extensions/v1beta1/definitions.html | 4 ++-- docs/api-reference/v1/definitions.html | 4 ++-- federation/apis/openapi-spec/swagger.json | 5 ++--- federation/apis/swagger-spec/extensions_v1beta1.json | 5 ++--- .../docs/api-reference/extensions/v1beta1/definitions.html | 4 ++-- staging/src/k8s.io/api/core/v1/generated.proto | 3 +++ .../src/k8s.io/api/core/v1/types_swagger_doc_generated.go | 2 +- 20 files changed, 40 insertions(+), 47 deletions(-) diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 866205206f6..b40ea542133 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -63977,8 +63977,7 @@ "io.k8s.api.core.v1.Container": { "description": "A single application container that you want to run within a pod.", "required": [ - "name", - "image" + "name" ], "properties": { "args": { @@ -64012,7 +64011,7 @@ } }, "image": { - "description": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images", + "description": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.", "type": "string" }, "imagePullPolicy": { diff --git a/api/swagger-spec/apps_v1beta1.json b/api/swagger-spec/apps_v1beta1.json index 8b9220bcd85..651103d0fec 100644 --- a/api/swagger-spec/apps_v1beta1.json +++ b/api/swagger-spec/apps_v1beta1.json @@ -5323,8 +5323,7 @@ "id": "v1.Container", "description": "A single application container that you want to run within a pod.", "required": [ - "name", - "image" + "name" ], "properties": { "name": { @@ -5333,7 +5332,7 @@ }, "image": { "type": "string", - "description": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images" + "description": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets." }, "command": { "type": "array", diff --git a/api/swagger-spec/apps_v1beta2.json b/api/swagger-spec/apps_v1beta2.json index 87a9eb81fed..c8009aba601 100644 --- a/api/swagger-spec/apps_v1beta2.json +++ b/api/swagger-spec/apps_v1beta2.json @@ -7653,8 +7653,7 @@ "id": "v1.Container", "description": "A single application container that you want to run within a pod.", "required": [ - "name", - "image" + "name" ], "properties": { "name": { @@ -7663,7 +7662,7 @@ }, "image": { "type": "string", - "description": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images" + "description": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets." }, "command": { "type": "array", diff --git a/api/swagger-spec/batch_v1.json b/api/swagger-spec/batch_v1.json index a03808ef40a..1eac0dd2553 100644 --- a/api/swagger-spec/batch_v1.json +++ b/api/swagger-spec/batch_v1.json @@ -2718,8 +2718,7 @@ "id": "v1.Container", "description": "A single application container that you want to run within a pod.", "required": [ - "name", - "image" + "name" ], "properties": { "name": { @@ -2728,7 +2727,7 @@ }, "image": { "type": "string", - "description": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images" + "description": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets." }, "command": { "type": "array", diff --git a/api/swagger-spec/batch_v1beta1.json b/api/swagger-spec/batch_v1beta1.json index b53a81323b8..3a4030a22ee 100644 --- a/api/swagger-spec/batch_v1beta1.json +++ b/api/swagger-spec/batch_v1beta1.json @@ -2773,8 +2773,7 @@ "id": "v1.Container", "description": "A single application container that you want to run within a pod.", "required": [ - "name", - "image" + "name" ], "properties": { "name": { @@ -2783,7 +2782,7 @@ }, "image": { "type": "string", - "description": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images" + "description": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets." }, "command": { "type": "array", diff --git a/api/swagger-spec/batch_v2alpha1.json b/api/swagger-spec/batch_v2alpha1.json index 333cb278054..6d5fa876ecb 100644 --- a/api/swagger-spec/batch_v2alpha1.json +++ b/api/swagger-spec/batch_v2alpha1.json @@ -2773,8 +2773,7 @@ "id": "v1.Container", "description": "A single application container that you want to run within a pod.", "required": [ - "name", - "image" + "name" ], "properties": { "name": { @@ -2783,7 +2782,7 @@ }, "image": { "type": "string", - "description": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images" + "description": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets." }, "command": { "type": "array", diff --git a/api/swagger-spec/extensions_v1beta1.json b/api/swagger-spec/extensions_v1beta1.json index ce6a6e56edc..c1885075c61 100644 --- a/api/swagger-spec/extensions_v1beta1.json +++ b/api/swagger-spec/extensions_v1beta1.json @@ -8271,8 +8271,7 @@ "id": "v1.Container", "description": "A single application container that you want to run within a pod.", "required": [ - "name", - "image" + "name" ], "properties": { "name": { @@ -8281,7 +8280,7 @@ }, "image": { "type": "string", - "description": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images" + "description": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets." }, "command": { "type": "array", diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index 559ff273089..d583b0a87a2 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -21659,8 +21659,7 @@ "id": "v1.Container", "description": "A single application container that you want to run within a pod.", "required": [ - "name", - "image" + "name" ], "properties": { "name": { @@ -21669,7 +21668,7 @@ }, "image": { "type": "string", - "description": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images" + "description": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets." }, "command": { "type": "array", diff --git a/docs/api-reference/apps/v1beta1/definitions.html b/docs/api-reference/apps/v1beta1/definitions.html index 0a60fe0aa3c..8729d4365dc 100755 --- a/docs/api-reference/apps/v1beta1/definitions.html +++ b/docs/api-reference/apps/v1beta1/definitions.html @@ -5500,8 +5500,8 @@ Examples:

image

-

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

-

true

+

Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.

+

false

string

diff --git a/docs/api-reference/apps/v1beta2/definitions.html b/docs/api-reference/apps/v1beta2/definitions.html index fd464c834fb..409797beb11 100755 --- a/docs/api-reference/apps/v1beta2/definitions.html +++ b/docs/api-reference/apps/v1beta2/definitions.html @@ -5765,8 +5765,8 @@ Examples:

image

-

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

-

true

+

Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.

+

false

string

diff --git a/docs/api-reference/batch/v1/definitions.html b/docs/api-reference/batch/v1/definitions.html index bd9ce3460f1..3bb612eeca9 100755 --- a/docs/api-reference/batch/v1/definitions.html +++ b/docs/api-reference/batch/v1/definitions.html @@ -4385,8 +4385,8 @@ Examples:

image

-

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

-

true

+

Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.

+

false

string

diff --git a/docs/api-reference/batch/v1beta1/definitions.html b/docs/api-reference/batch/v1beta1/definitions.html index b0aef880643..58eb6642343 100755 --- a/docs/api-reference/batch/v1beta1/definitions.html +++ b/docs/api-reference/batch/v1beta1/definitions.html @@ -4536,8 +4536,8 @@ Examples:

image

-

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

-

true

+

Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.

+

false

string

diff --git a/docs/api-reference/batch/v2alpha1/definitions.html b/docs/api-reference/batch/v2alpha1/definitions.html index f3bcb5bc5e8..a65a0d39877 100755 --- a/docs/api-reference/batch/v2alpha1/definitions.html +++ b/docs/api-reference/batch/v2alpha1/definitions.html @@ -4392,8 +4392,8 @@ Examples:

image

-

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

-

true

+

Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.

+

false

string

diff --git a/docs/api-reference/extensions/v1beta1/definitions.html b/docs/api-reference/extensions/v1beta1/definitions.html index 87f0b3f588a..6d3dcc4ea58 100755 --- a/docs/api-reference/extensions/v1beta1/definitions.html +++ b/docs/api-reference/extensions/v1beta1/definitions.html @@ -6282,8 +6282,8 @@ 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

-

true

+

Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.

+

false

string

diff --git a/docs/api-reference/v1/definitions.html b/docs/api-reference/v1/definitions.html index db8f27a6c52..3e66281a9d6 100755 --- a/docs/api-reference/v1/definitions.html +++ b/docs/api-reference/v1/definitions.html @@ -7368,8 +7368,8 @@ Examples:

image

-

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

-

true

+

Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.

+

false

string

diff --git a/federation/apis/openapi-spec/swagger.json b/federation/apis/openapi-spec/swagger.json index 4f698373a96..e5502314563 100644 --- a/federation/apis/openapi-spec/swagger.json +++ b/federation/apis/openapi-spec/swagger.json @@ -10770,8 +10770,7 @@ "io.k8s.api.core.v1.Container": { "description": "A single application container that you want to run within a pod.", "required": [ - "name", - "image" + "name" ], "properties": { "args": { @@ -10805,7 +10804,7 @@ } }, "image": { - "description": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images", + "description": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.", "type": "string" }, "imagePullPolicy": { diff --git a/federation/apis/swagger-spec/extensions_v1beta1.json b/federation/apis/swagger-spec/extensions_v1beta1.json index fa1a93a13c3..b2f5baba43f 100644 --- a/federation/apis/swagger-spec/extensions_v1beta1.json +++ b/federation/apis/swagger-spec/extensions_v1beta1.json @@ -6470,8 +6470,7 @@ "id": "v1.Container", "description": "A single application container that you want to run within a pod.", "required": [ - "name", - "image" + "name" ], "properties": { "name": { @@ -6480,7 +6479,7 @@ }, "image": { "type": "string", - "description": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images" + "description": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets." }, "command": { "type": "array", diff --git a/federation/docs/api-reference/extensions/v1beta1/definitions.html b/federation/docs/api-reference/extensions/v1beta1/definitions.html index ebd3202a571..9490ee5a226 100755 --- a/federation/docs/api-reference/extensions/v1beta1/definitions.html +++ b/federation/docs/api-reference/extensions/v1beta1/definitions.html @@ -5708,8 +5708,8 @@ 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

-

true

+

Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.

+

false

string

diff --git a/staging/src/k8s.io/api/core/v1/generated.proto b/staging/src/k8s.io/api/core/v1/generated.proto index 344fc87fb87..6f04f8009eb 100644 --- a/staging/src/k8s.io/api/core/v1/generated.proto +++ b/staging/src/k8s.io/api/core/v1/generated.proto @@ -441,6 +441,9 @@ message Container { // Docker image name. // More info: https://kubernetes.io/docs/concepts/containers/images + // This field is optional to allow higher level config management to default or override + // container images in workload controllers like Deployments and StatefulSets. + // +optional optional string image = 2; // Entrypoint array. Not executed within a shell. diff --git a/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go index 7676b004753..4fc4deaa4a7 100644 --- a/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go @@ -269,7 +269,7 @@ func (ConfigMapVolumeSource) SwaggerDoc() map[string]string { var map_Container = map[string]string{ "": "A single application container that you want to run within a pod.", "name": "Name of the container specified as a DNS_LABEL. Each container in a pod must have a unique name (DNS_LABEL). Cannot be updated.", - "image": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images", + "image": "Docker image name. More info: https://kubernetes.io/docs/concepts/containers/images This field is optional to allow higher level config management to default or override container images in workload controllers like Deployments and StatefulSets.", "command": "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 cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell", "args": "Arguments to the entrypoint. The docker image's CMD is used if this is not provided. Variable references $(VAR_NAME) are expanded using the container's environment. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell", "workingDir": "Container's working directory. If not specified, the container runtime's default will be used, which might be configured in the container image. Cannot be updated.",