PVC fixes et al: https://github.com/kubernetes/kompose/pull/1470/files#diff-06572a96a58dc510037d5efa622f9bec8519bc1beab13c9f251e97e657a9d4edR1519