github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 14:11:14 +00:00
Code Issues Projects Releases Wiki Activity

Introduce terminationMessagePath to Container, and update conversion code

Browse Source 
to assign the default path.

Move default setting for terminationMessagePath to conversion
from validation. Addressed other comments.
This commit is contained in:
Dawn Chen
2014-11-05 11:08:26 -08:00
parent 5342bb4306
commit 8ffbced280
7 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/api/conversion.go
View File

@@ -34,6 +34,14 @@ func init() {
out.Spec.RestartPolicy = in.RestartPolicy
out.Name = in.ID
out.UID = in.UUID
// TODO(dchen1107): Move this conversion to pkg/api/v1beta[123]/conversion.go
// along with fixing #1502
for i := range out.Spec.Containers {
ctr := &out.Spec.Containers[i]
if len(ctr.TerminationMessagePath) == 0 {
ctr.TerminationMessagePath = TerminationMessagePathDefault
}
}
return nil
},
func(in *BoundPod, out *ContainerManifest, s conversion.Scope) error {
@@ -43,6 +51,12 @@ func init() {
out.Version = "v1beta2"
out.ID = in.Name
out.UUID = in.UID
for i := range out.Containers {
ctr := &out.Containers[i]
if len(ctr.TerminationMessagePath) == 0 {
ctr.TerminationMessagePath = TerminationMessagePathDefault
}
}
return nil
},
func(in *ContainerManifestList, out *BoundPods, s conversion.Scope) error {