Skip to content

K
k3s
Commit b8a808b1 authored by Tim Hockin's avatar Tim Hockin
Browse files
Options

Merge pull request #8592 from RichieEscarez/5057_restartpolicy_default

5057 restartpolicy default
parents 93a67b75 0076c181
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 21 deletions
api/swagger-spec/v1beta3.json
View file @ b8a808b1
...@@ -9575,10 +9575,6 @@ ...@@ -9575,10 +9575,6 @@
} }
} }
}, },
"v1beta3.AccessModeType": {
"id": "v1beta3.AccessModeType",
"properties": {}
},
"v1beta3.Binding": { "v1beta3.Binding": {
"id": "v1beta3.Binding", "id": "v1beta3.Binding",
"required": [ "required": [
...@@ -9609,21 +9605,21 @@ ...@@ -9609,21 +9605,21 @@
"add": { "add": {
"type": "array", "type": "array",
"items": { "items": {
"$ref": "v1beta3.CapabilityType" "$ref": "v1beta3.Capability"
}, },
"description": "added capabilities" "description": "added capabilities"
}, },
"drop": { "drop": {
"type": "array", "type": "array",
"items": { "items": {
"$ref": "v1beta3.CapabilityType" "$ref": "v1beta3.Capability"
}, },
"description": "droped capabilities" "description": "droped capabilities"
} }
} }
}, },
"v1beta3.CapabilityType": { "v1beta3.Capability": {
"id": "v1beta3.CapabilityType", "id": "v1beta3.Capability",
"properties": {} "properties": {}
}, },
"v1beta3.ComponentCondition": { "v1beta3.ComponentCondition": {
...@@ -10471,6 +10467,15 @@ ...@@ -10471,6 +10467,15 @@
} }
} }
}, },
"v1beta3.LocalObjectReference": {
"id": "v1beta3.LocalObjectReference",
"properties": {
"name": {
"type": "string",
"description": "name of the referent"
}
}
},
"v1beta3.NFSVolumeSource": { "v1beta3.NFSVolumeSource": {
"id": "v1beta3.NFSVolumeSource", "id": "v1beta3.NFSVolumeSource",
"required": [ "required": [
...@@ -10807,7 +10812,7 @@ ...@@ -10807,7 +10812,7 @@
}, },
"namespace": { "namespace": {
"type": "string", "type": "string",
"description": "namespace of the object; cannot be updated" "description": "namespace of the object; must be a DNS_LABEL; cannot be updated"
}, },
"resourceVersion": { "resourceVersion": {
"type": "string", "type": "string",
...@@ -10881,6 +10886,10 @@ ...@@ -10881,6 +10886,10 @@
} }
} }
}, },
"v1beta3.PersistentVolumeAccessMode": {
"id": "v1beta3.PersistentVolumeAccessMode",
"properties": {}
},
"v1beta3.PersistentVolumeClaim": { "v1beta3.PersistentVolumeClaim": {
"id": "v1beta3.PersistentVolumeClaim", "id": "v1beta3.PersistentVolumeClaim",
"properties": { "properties": {
...@@ -10936,7 +10945,7 @@ ...@@ -10936,7 +10945,7 @@
"accessModes": { "accessModes": {
"type": "array", "type": "array",
"items": { "items": {
"$ref": "v1beta3.AccessModeType" "$ref": "v1beta3.PersistentVolumeAccessMode"
}, },
"description": "the desired access modes the volume should have" "description": "the desired access modes the volume should have"
}, },
...@@ -10956,7 +10965,7 @@ ...@@ -10956,7 +10965,7 @@
"accessModes": { "accessModes": {
"type": "array", "type": "array",
"items": { "items": {
"$ref": "v1beta3.AccessModeType" "$ref": "v1beta3.PersistentVolumeAccessMode"
}, },
"description": "the actual access modes the volume has" "description": "the actual access modes the volume has"
}, },
...@@ -11013,7 +11022,7 @@ ...@@ -11013,7 +11022,7 @@
"accessModes": { "accessModes": {
"type": "array", "type": "array",
"items": { "items": {
"$ref": "v1beta3.AccessModeType" "$ref": "v1beta3.PersistentVolumeAccessMode"
}, },
"description": "all ways the volume can be mounted" "description": "all ways the volume can be mounted"
}, },
...@@ -11155,13 +11164,20 @@ ...@@ -11155,13 +11164,20 @@
"type": "boolean", "type": "boolean",
"description": "host networking requested for this pod" "description": "host networking requested for this pod"
}, },
"imagePullSecrets": {
"type": "array",
"items": {
"$ref": "v1beta3.LocalObjectReference"
},
"description": "list of references to secrets in the same namespace available for pulling the container images"
},
"nodeSelector": { "nodeSelector": {
"type": "any", "type": "any",
"description": "selector which must match a node's labels for the pod to be scheduled on that node" "description": "selector which must match a node's labels for the pod to be scheduled on that node"
}, },
"restartPolicy": { "restartPolicy": {
"type": "string", "type": "string",
"description": "restart policy for all containers within the pod; one of RestartPolicyAlways, RestartPolicyOnFailure, RestartPolicyNever" "description": "restart policy for all containers within the pod; one of RestartPolicyAlways, RestartPolicyOnFailure, RestartPolicyNever; defaults to RestartPolicyAlways"
}, },
"serviceAccount": { "serviceAccount": {
"type": "string", "type": "string",
......
docs/pod-states.md
View file @ b8a808b1
...@@ -25,7 +25,7 @@ More detailed information about the current (and previous) container statuses ca ...@@ -25,7 +25,7 @@ More detailed information about the current (and previous) container statuses ca
## RestartPolicy ## RestartPolicy
The RestartPolicy may be `Always`, `OnFailure`, or `Never`. RestartPolicy applies to all containers in the pod. RestartPolicy only refers to restarts of the containers by the Kubelet on the same node. As discussed in the [pods document](pods.md#durability-of-pods-or-lack-thereof), once bound to a node, a pod may never be rebound to another node. This means that some kind of controller is necessary in order for a pod to survive node failure, even if just a single pod at a time is desired. The possible values for RestartPolicy are `Always`, `OnFailure`, or `Never`. If RestartPolicy is not set, the default value is `Always`. RestartPolicy applies to all containers in the pod. RestartPolicy only refers to restarts of the containers by the Kubelet on the same node. As discussed in the [pods document](pods.md#durability-of-pods-or-lack-thereof), once bound to a node, a pod may never be rebound to another node. This means that some kind of controller is necessary in order for a pod to survive node failure, even if just a single pod at a time is desired.
The only controller we have today is [`ReplicationController`](replication-controller.md). `ReplicationController` is *only* appropriate for pods with `RestartPolicy = Always`. `ReplicationController` should refuse to instantiate any pod that has a different restart policy. The only controller we have today is [`ReplicationController`](replication-controller.md). `ReplicationController` is *only* appropriate for pods with `RestartPolicy = Always`. `ReplicationController` should refuse to instantiate any pod that has a different restart policy.
......
docs/replication-controller.md
View file @ b8a808b1
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
A _replication controller_ ensures that a specified number of pod "replicas" are running at any one time. If there are too many, it will kill some. If there are too few, it will start more. Unlike in the case where a user directly created pods, a replication controller replaces pods that are deleted or terminated for any reason, such as in the case of node failure or disruptive node maintenance, such as a kernel upgrade. For this reason, we recommend that you use a replication controller even if your application requires only a single pod. Think of it similarly to a process supervisor, only it supervises multiple pods across multiple nodes instead of individual processes on a single node. Replication controller delegates local container restarts to some agent on the node (e.g., Kubelet or Docker). A _replication controller_ ensures that a specified number of pod "replicas" are running at any one time. If there are too many, it will kill some. If there are too few, it will start more. Unlike in the case where a user directly created pods, a replication controller replaces pods that are deleted or terminated for any reason, such as in the case of node failure or disruptive node maintenance, such as a kernel upgrade. For this reason, we recommend that you use a replication controller even if your application requires only a single pod. Think of it similarly to a process supervisor, only it supervises multiple pods across multiple nodes instead of individual processes on a single node. Replication controller delegates local container restarts to some agent on the node (e.g., Kubelet or Docker).
As discussed in [life of a pod](pod-states.md), `replicationcontroller` is *only* appropriate for pods with `RestartPolicy = Always`. `ReplicationController` should refuse to instantiate any pod that has a different restart policy. As discussed in [issue #503](https://github.com/GoogleCloudPlatform/kubernetes/issues/503#issuecomment-50169443), we expect other types of controllers to be added to Kubernetes to handle other types of workloads, such as build/test and batch workloads, in the future. As discussed in [life of a pod](pod-states.md), `replicationController` is *only* appropriate for pods with `RestartPolicy = Always` (Note: If `RestartPolicy` is not set, the default value is `Always`.). `ReplicationController` should refuse to instantiate any pod that has a different restart policy. As discussed in [issue #503](https://github.com/GoogleCloudPlatform/kubernetes/issues/503#issuecomment-50169443), we expect other types of controllers to be added to Kubernetes to handle other types of workloads, such as build/test and batch workloads, in the future.
A replication controller will never terminate on its own, but it isn't expected to be as long-lived as services. Services may be composed of pods controlled by multiple replication controllers, and it is expected that many replication controllers may be created and destroyed over the lifetime of a service. Both services themselves and their clients should remain oblivious to the replication controllers that maintain the pods of the services. A replication controller will never terminate on its own, but it isn't expected to be as long-lived as services. Services may be composed of pods controlled by multiple replication controllers, and it is expected that many replication controllers may be created and destroyed over the lifetime of a service. Both services themselves and their clients should remain oblivious to the replication controllers that maintain the pods of the services.
......
pkg/api/v1/types.go
View file @ b8a808b1
...@@ -845,7 +845,7 @@ type PodSpec struct { ...@@ -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"` 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. // 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"` 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"` RestartPolicy RestartPolicy `json:"restartPolicy,omitempty" description:"restart policy for all containers within the pod; one of RestartPolicyAlways, RestartPolicyOnFailure, RestartPolicyNever; defaults to RestartPolicyAlways"`
// Optional duration in seconds the pod needs to terminate gracefully. May be decreased in delete request. // 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. // 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. // If this value is nil, the default grace period will be used instead.
......
pkg/api/v1beta1/types.go
View file @ b8a808b1
...@@ -60,7 +60,7 @@ type ContainerManifest struct { ...@@ -60,7 +60,7 @@ type ContainerManifest struct {
UUID types.UID `json:"uuid,omitempty" description:"manifest UUID, populated by the system, read-only"` UUID types.UID `json:"uuid,omitempty" description:"manifest UUID, populated by the system, read-only"`
Volumes []Volume `json:"volumes" description:"list of volumes that can be mounted by containers belonging to the pod"` Volumes []Volume `json:"volumes" description:"list of volumes that can be mounted by containers belonging to the pod"`
Containers []Container `json:"containers" description:"list of containers belonging to the pod; containers cannot currently be added or removed"` Containers []Container `json:"containers" description:"list of containers belonging to the pod; containers cannot currently be added or removed"`
RestartPolicy RestartPolicy `json:"restartPolicy,omitempty" description:"restart policy for all containers within the pod; one of RestartPolicyAlways, RestartPolicyOnFailure, RestartPolicyNever"` RestartPolicy RestartPolicy `json:"restartPolicy,omitempty" description:"restart policy for all containers within the pod; one of RestartPolicyAlways, RestartPolicyOnFailure, RestartPolicyNever; defaults to RestartPolicyAlways"`
// Optional duration in seconds the pod needs to terminate gracefully. May be decreased in delete request. // 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. // 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. // If this value is nil, the default grace period will be used instead.
...@@ -1598,7 +1598,7 @@ type PodSpec struct { ...@@ -1598,7 +1598,7 @@ type PodSpec struct {
Volumes []Volume `json:"volumes" description:"list of volumes that can be mounted by containers belonging to the pod"` Volumes []Volume `json:"volumes" description:"list of volumes that can be mounted by containers belonging to the pod"`
// Required: there must be at least one container in a pod. // Required: there must be at least one container in a pod.
Containers []Container `json:"containers" description:"list of containers belonging to the pod; containers cannot currently be added or removed; there must be at least one container in a Pod"` Containers []Container `json:"containers" description:"list of containers belonging to the pod; containers cannot currently be added or removed; there must be at least one container in a Pod"`
RestartPolicy RestartPolicy `json:"restartPolicy,omitempty" description:"restart policy for all containers within the pod; one of RestartPolicyAlways, RestartPolicyOnFailure, RestartPolicyNever"` RestartPolicy RestartPolicy `json:"restartPolicy,omitempty" description:"restart policy for all containers within the pod; one of RestartPolicyAlways, RestartPolicyOnFailure, RestartPolicyNever; defaults to RestartPolicyAlways"`
// TerminationGracePeriodSeconds *int64 `json:"terminationGracePeriodSeconds,omitempty"` // TerminationGracePeriodSeconds *int64 `json:"terminationGracePeriodSeconds,omitempty"`
// Optional: Set DNS policy. Defaults to "ClusterFirst" // Optional: Set DNS policy. Defaults to "ClusterFirst"
DNSPolicy DNSPolicy `json:"dnsPolicy,omitempty" description:"DNS policy for containers within the pod; one of 'ClusterFirst' or 'Default'"` DNSPolicy DNSPolicy `json:"dnsPolicy,omitempty" description:"DNS policy for containers within the pod; one of 'ClusterFirst' or 'Default'"`
......
pkg/api/v1beta2/types.go
View file @ b8a808b1
...@@ -1626,7 +1626,7 @@ type ContainerManifest struct { ...@@ -1626,7 +1626,7 @@ type ContainerManifest struct {
UUID types.UID `json:"uuid,omitempty" description:"manifest UUID; cannot be updated"` UUID types.UID `json:"uuid,omitempty" description:"manifest UUID; cannot be updated"`
Volumes []Volume `json:"volumes" description:"list of volumes that can be mounted by containers belonging to the pod"` Volumes []Volume `json:"volumes" description:"list of volumes that can be mounted by containers belonging to the pod"`
Containers []Container `json:"containers" description:"list of containers belonging to the pod; cannot be updated; containers cannot currently be added or removed"` Containers []Container `json:"containers" description:"list of containers belonging to the pod; cannot be updated; containers cannot currently be added or removed"`
RestartPolicy RestartPolicy `json:"restartPolicy,omitempty" description:"restart policy for all containers within the pod; one of RestartPolicyAlways, RestartPolicyOnFailure, RestartPolicyNever"` RestartPolicy RestartPolicy `json:"restartPolicy,omitempty" description:"restart policy for all containers within the pod; one of RestartPolicyAlways, RestartPolicyOnFailure, RestartPolicyNever; defaults to RestartPolicyAlways"`
// Optional duration in seconds the pod needs to terminate gracefully. May be decreased in delete request. // 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. // 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. // If this value is nil, the default grace period will be used instead.
...@@ -1675,7 +1675,7 @@ type PodSpec struct { ...@@ -1675,7 +1675,7 @@ type PodSpec struct {
Volumes []Volume `json:"volumes" description:"list of volumes that can be mounted by containers belonging to the pod"` Volumes []Volume `json:"volumes" description:"list of volumes that can be mounted by containers belonging to the pod"`
// Required: there must be at least one container in a pod. // Required: there must be at least one container in a pod.
Containers []Container `json:"containers" description:"list of containers belonging to the pod; containers cannot currently be added or removed; there must be at least one container in a Pod"` Containers []Container `json:"containers" description:"list of containers belonging to the pod; containers cannot currently be added or removed; there must be at least one container in a Pod"`
RestartPolicy RestartPolicy `json:"restartPolicy,omitempty" description:"restart policy for all containers within the pod; one of RestartPolicyAlways, RestartPolicyOnFailure, RestartPolicyNever"` RestartPolicy RestartPolicy `json:"restartPolicy,omitempty" description:"restart policy for all containers within the pod; one of RestartPolicyAlways, RestartPolicyOnFailure, RestartPolicyNever; defaults to RestartPolicyAlways"`
// Optional: Set DNS policy. Defaults to "ClusterFirst" // Optional: Set DNS policy. Defaults to "ClusterFirst"
DNSPolicy DNSPolicy `json:"dnsPolicy,omitempty" description:"DNS policy for containers within the pod; one of 'ClusterFirst' or 'Default'"` DNSPolicy DNSPolicy `json:"dnsPolicy,omitempty" description:"DNS policy for containers within the pod; one of 'ClusterFirst' or 'Default'"`
// NodeSelector is a selector which must be true for the pod to fit on a node // NodeSelector is a selector which must be true for the pod to fit on a node
......
pkg/api/v1beta3/types.go
View file @ b8a808b1
...@@ -849,7 +849,7 @@ type PodSpec struct { ...@@ -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"` 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. // 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"` 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"` RestartPolicy RestartPolicy `json:"restartPolicy,omitempty" description:"restart policy for all containers within the pod; one of RestartPolicyAlways, RestartPolicyOnFailure, RestartPolicyNever; defaults to RestartPolicyAlways"`
// Optional duration in seconds the pod needs to terminate gracefully. May be decreased in delete request. // 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. // 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. // If this value is nil, the default grace period will be used instead.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment