Merge pull request #13447 from pweil-/pid-mode

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-09-16 23:34:35 -07:00
37 changed files with 366 additions and 145 deletions

View File

@@ -1446,6 +1446,7 @@ func deepCopy_api_PodSpec(in PodSpec, out *PodSpec, c *conversion.Cloner) error
out.ServiceAccountName = in.ServiceAccountName
out.NodeName = in.NodeName
out.HostNetwork = in.HostNetwork
out.HostPID = in.HostPID
if in.ImagePullSecrets != nil {
out.ImagePullSecrets = make([]LocalObjectReference, len(in.ImagePullSecrets))
for i := range in.ImagePullSecrets {