Merge pull request #1742 from dchen1107/termination

Set EmptyDir when VolumeSource is absent.
pull/6/head
Brendan Burns 2014-10-10 16:27:26 -07:00
commit 695fbee343
2 changed files with 7 additions and 4 deletions

View File

@ -33,10 +33,13 @@ func validateVolumes(volumes []api.Volume) (util.StringSet, errs.ErrorList) {
for i := range volumes {
vol := &volumes[i] // so we can set default values
el := errs.ErrorList{}
// TODO(thockin) enforce that a source is set once we deprecate the implied form.
if vol.Source != nil {
el = validateSource(vol.Source).Prefix("source")
if vol.Source == nil {
// TODO: Enforce that a source is set once we deprecate the implied form.
vol.Source = &api.VolumeSource{
EmptyDir: &api.EmptyDir{},
}
}
el = validateSource(vol.Source).Prefix("source")
if len(vol.Name) == 0 {
el = append(el, errs.NewFieldRequired("name", vol.Name))
} else if !util.IsDNSLabel(vol.Name) {

View File

@ -63,7 +63,7 @@ func TestValidateVolumes(t *testing.T) {
for k, v := range errorCases {
_, errs := validateVolumes(v.V)
if len(errs) == 0 {
t.Errorf("expected failure for %s", k)
t.Errorf("expected failure %s for %v", k, v.V)
continue
}
for i := range errs {