fix empty_dir formatting

This commit is contained in:
Brad Rydzewski 2019-01-24 14:46:30 -08:00
parent 98eb77b4c5
commit b6add0c2d9
3 changed files with 20 additions and 4 deletions

View File

@ -189,10 +189,16 @@ func printVolumes(w writer, v []*yaml.Volume) {
s.WriteTagValue("name", v.Name) s.WriteTagValue("name", v.Name)
if v := v.EmptyDir; v != nil { if v := v.EmptyDir; v != nil {
s.WriteTag("temp") s.WriteTag("temp")
s.IndentIncrease() if isEmptyDirEmpty(v) {
s.WriteTagValue("medium", v.Medium) w.WriteByte(' ')
s.WriteTagValue("size_limit", v.SizeLimit) w.WriteByte('{')
s.IndentDecrease() w.WriteByte('}')
} else {
s.IndentIncrease()
s.WriteTagValue("medium", v.Medium)
s.WriteTagValue("size_limit", v.SizeLimit)
s.IndentDecrease()
}
} }
if v := v.HostPath; v != nil { if v := v.HostPath; v != nil {
@ -263,3 +269,9 @@ func isConditionsEmpty(v yaml.Conditions) bool {
func isConditionEmpty(v yaml.Condition) bool { func isConditionEmpty(v yaml.Condition) bool {
return len(v.Exclude) == 0 && len(v.Include) == 0 return len(v.Exclude) == 0 && len(v.Include) == 0
} }
// helper function returns true if the emptydir
// object is empty.
func isEmptyDirEmpty(v *yaml.VolumeEmptyDir) bool {
return v.SizeLimit == 0 && len(v.Medium) == 0
}

View File

@ -21,6 +21,8 @@ volumes:
- name: temp - name: temp
temp: temp:
medium: memory medium: memory
- name: empty
temp: {}
- name: sock - name: sock
host: host:
path: /var/run/docker.sock path: /var/run/docker.sock

View File

@ -25,6 +25,8 @@ volumes:
- name: temp - name: temp
temp: temp:
medium: memory medium: memory
- name: empty
temp: {}
- name: sock - name: sock
host: host:
path: /var/run/docker.sock path: /var/run/docker.sock