Merge pull request #12957 from smarterclayton/handle_terminating_pods

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-08-20 21:47:00 -07:00
47 changed files with 561 additions and 94 deletions

View File

@@ -143,6 +143,10 @@ type ObjectMeta struct {
// will send a hard termination signal to the container.
DeletionTimestamp *util.Time `json:"deletionTimestamp,omitempty"`
// DeletionGracePeriodSeconds records the graceful deletion value set when graceful deletion
// was requested. Represents the most recent grace period, and may only be shortened once set.
DeletionGracePeriodSeconds *int64 `json:"deletionGracePeriodSeconds,omitempty"`
// Labels are key value pairs that may be used to scope and select individual resources.
// Label keys are of the form:
// label-key ::= prefixed-name | name