From f7ede600455a29c38ddc37dfa2e87df9a7fa03e1 Mon Sep 17 00:00:00 2001 From: markturansky Date: Mon, 25 May 2015 12:03:10 -0400 Subject: [PATCH] normalized json tags across volumes --- pkg/api/types.go | 2 +- pkg/api/v1/types.go | 2 +- pkg/api/v1beta3/types.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/api/types.go b/pkg/api/types.go index 558426da78c..9a473187f88 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -204,7 +204,7 @@ type VolumeSource struct { // Glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime Glusterfs *GlusterfsVolumeSource `json:"glusterfs"` // PersistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same namespace - PersistentVolumeClaimVolumeSource *PersistentVolumeClaimVolumeSource `json:"persistentVolumeClaim,omitempty"` + PersistentVolumeClaimVolumeSource *PersistentVolumeClaimVolumeSource `json:"persistentVolumeClaim"` // RBD represents a Rados Block Device mount on the host that shares a pod's lifetime RBD *RBDVolumeSource `json:"rbd"` } diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go index e9cc86b9ec6..c94b9f6f668 100644 --- a/pkg/api/v1/types.go +++ b/pkg/api/v1/types.go @@ -223,7 +223,7 @@ type VolumeSource struct { // PersistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same namespace PersistentVolumeClaimVolumeSource *PersistentVolumeClaimVolumeSource `json:"persistentVolumeClaim,omitempty" description:"a reference to a PersistentVolumeClaim in the same namespace"` // RBD represents a Rados Block Device mount on the host that shares a pod's lifetime - RBD *RBDVolumeSource `json:"rbd" description:"rados block volume that will be mounted on the host machine"` + RBD *RBDVolumeSource `json:"rbd,omitempty" description:"rados block volume that will be mounted on the host machine"` } type PersistentVolumeClaimVolumeSource struct { diff --git a/pkg/api/v1beta3/types.go b/pkg/api/v1beta3/types.go index 27956cb2a0b..34fe05c5910 100644 --- a/pkg/api/v1beta3/types.go +++ b/pkg/api/v1beta3/types.go @@ -223,7 +223,7 @@ type VolumeSource struct { // PersistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same namespace PersistentVolumeClaimVolumeSource *PersistentVolumeClaimVolumeSource `json:"persistentVolumeClaim,omitempty" description:"a reference to a PersistentVolumeClaim in the same namespace"` // RBD represents a Rados Block Device mount on the host that shares a pod's lifetime - RBD *RBDVolumeSource `json:"rbd" description:"rados block volume that will be mounted on the host machine"` + RBD *RBDVolumeSource `json:"rbd,omitempty" description:"rados block volume that will be mounted on the host machine"` } type PersistentVolumeClaimVolumeSource struct {