diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index a4cbc6970f2..d40967a0f56 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -10884,7 +10884,7 @@ }, "restartPolicy": { "type": "string", - "description": "restart policy for all containers within the pod; one of RestartPolicyAlways, RestartPolicyOnFailure, RestartPolicyNever; defaults to RestartPolicyAlways" + "description": "restart policy for all containers within the pod; one of Always, OnFailure, Never; defaults to Always" }, "terminationGracePeriodSeconds": { "type": "integer", diff --git a/api/swagger-spec/v1beta3.json b/api/swagger-spec/v1beta3.json index ca8407ad61e..0944cab6418 100644 --- a/api/swagger-spec/v1beta3.json +++ b/api/swagger-spec/v1beta3.json @@ -10862,8 +10862,7 @@ "v1beta3.PodSpec": { "id": "v1beta3.PodSpec", "required": [ - "containers", - "serviceAccount" + "containers" ], "properties": { "volumes": { @@ -10882,7 +10881,7 @@ }, "restartPolicy": { "type": "string", - "description": "restart policy for all containers within the pod; one of RestartPolicyAlways, RestartPolicyOnFailure, RestartPolicyNever; defaults to RestartPolicyAlways" + "description": "restart policy for all containers within the pod; one of Always, OnFailure, Never; defaults to Always" }, "terminationGracePeriodSeconds": { "type": "integer", diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go index 63b17d0a8c4..69ea340251c 100644 --- a/pkg/api/v1/types.go +++ b/pkg/api/v1/types.go @@ -845,7 +845,7 @@ type PodSpec struct { Volumes []Volume `json:"volumes,omitempty" description:"list of volumes that can be mounted by containers belonging to the pod" patchStrategy:"merge" patchMergeKey:"name"` // Required: there must be at least one container in a pod. Containers []Container `json:"containers" description:"list of containers belonging to the pod; cannot be updated; containers cannot currently be added or removed; there must be at least one container in a Pod" patchStrategy:"merge" patchMergeKey:"name"` - RestartPolicy RestartPolicy `json:"restartPolicy,omitempty" description:"restart policy for all containers within the pod; one of RestartPolicyAlways, RestartPolicyOnFailure, RestartPolicyNever; defaults to RestartPolicyAlways"` + RestartPolicy RestartPolicy `json:"restartPolicy,omitempty" description:"restart policy for all containers within the pod; one of Always, OnFailure, Never; defaults to Always"` // Optional duration in seconds the pod needs to terminate gracefully. May be decreased in delete request. // Value must be non-negative integer. The value zero indicates delete immediately. // If this value is nil, the default grace period will be used instead. diff --git a/pkg/api/v1beta3/types.go b/pkg/api/v1beta3/types.go index 3cab8697bfd..d8cd5813622 100644 --- a/pkg/api/v1beta3/types.go +++ b/pkg/api/v1beta3/types.go @@ -849,7 +849,7 @@ type PodSpec struct { Volumes []Volume `json:"volumes,omitempty" description:"list of volumes that can be mounted by containers belonging to the pod" patchStrategy:"merge" patchMergeKey:"name"` // Required: there must be at least one container in a pod. Containers []Container `json:"containers" description:"list of containers belonging to the pod; cannot be updated; containers cannot currently be added or removed; there must be at least one container in a Pod" patchStrategy:"merge" patchMergeKey:"name"` - RestartPolicy RestartPolicy `json:"restartPolicy,omitempty" description:"restart policy for all containers within the pod; one of RestartPolicyAlways, RestartPolicyOnFailure, RestartPolicyNever; defaults to RestartPolicyAlways"` + RestartPolicy RestartPolicy `json:"restartPolicy,omitempty" description:"restart policy for all containers within the pod; one of Always, OnFailure, Never; defaults to Always"` // Optional duration in seconds the pod needs to terminate gracefully. May be decreased in delete request. // Value must be non-negative integer. The value zero indicates delete immediately. // If this value is nil, the default grace period will be used instead.