mirror of https://github.com/k3s-io/k3s
Merge pull request #1742 from dchen1107/termination
Set EmptyDir when VolumeSource is absent.pull/6/head
commit
695fbee343
|
@ -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) {
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in New Issue