github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5075 from thockin/fix_inline

Browse Source 
Fix VolumeSource inline in JSON
This commit is contained in:
Daniel Smith 2015-03-04 17:24:06 -08:00
commit feb98caac2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/types.go
View File

@ -158,7 +158,7 @@ type Volume struct {
// The VolumeSource represents the location and type of a volume to mount. // The VolumeSource represents the location and type of a volume to mount.
// This is optional for now. If not specified, the Volume is implied to be an EmptyDir. // This is optional for now. If not specified, the Volume is implied to be an EmptyDir.
// This implied behavior is deprecated and will be removed in a future version. // This implied behavior is deprecated and will be removed in a future version.
VolumeSource `json:"inline,omitempty"` VolumeSource `json:",inline,omitempty"`
} }
// VolumeSource represents the source location of a volume to mount. // VolumeSource represents the source location of a volume to mount.

2
pkg/api/v1beta3/types.go
View File

@ -177,7 +177,7 @@ type Volume struct {
// Source represents the location and type of a volume to mount. // Source represents the location and type of a volume to mount.
// This is optional for now. If not specified, the Volume is implied to be an EmptyDir. // This is optional for now. If not specified, the Volume is implied to be an EmptyDir.
// This implied behavior is deprecated and will be removed in a future version. // This implied behavior is deprecated and will be removed in a future version.
VolumeSource `json:"inline,omitempty"` VolumeSource `json:",inline,omitempty"`
} }
// VolumeSource represents the source location of a valume to mount. // VolumeSource represents the source location of a valume to mount.