Merge pull request #9103 from liggitt/omitempty_service_account

fix omitempty on PodSpec.ServiceAccount in v1beta3
This commit is contained in:
Brian Grant 2015-06-02 10:41:11 -07:00
commit 3f07503cea

View File

@ -870,7 +870,7 @@ type PodSpec struct {
NodeSelector map[string]string `json:"nodeSelector,omitempty" description:"selector which must match a node's labels for the pod to be scheduled on that node"`
// ServiceAccount is the name of the ServiceAccount to use to run this pod
ServiceAccount string `json:"serviceAccount" description:"name of the ServiceAccount to use to run this pod"`
ServiceAccount string `json:"serviceAccount,omitempty" description:"name of the ServiceAccount to use to run this pod"`
// Host is a request to schedule this pod onto a specific host. If it is non-empty,
// the the scheduler simply schedules this pod onto that host, assuming that it fits