Merge pull request #12470 from simon3z/add-host-ipc

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-09-21 09:15:01 -07:00
22 changed files with 107 additions and 19 deletions

View File

@@ -982,6 +982,9 @@ type PodSpec struct {
// Use the host's pid namespace.
// Optional: Default to false.
HostPID bool `json:"hostPID,omitempty"`
// Use the host's ipc namespace.
// Optional: Default to false.
HostIPC bool `json:"hostIPC,omitempty"`
// ImagePullSecrets is an optional list of references to secrets in the same namespace to use for pulling any of the images used by this PodSpec.
// If specified, these secrets will be passed to individual puller implementations for them to use. For example,
// in the case of docker, only DockerConfig type secrets are honored.