Merge pull request #2910 from smarterclayton/small_v1beta3_refactors

Fix internal -> v1beta3 round trip issues

pkg/api/register.go

@@ -35,8 +35,8 @@ func init() {
 		&NodeList{},
 		&Node{},
 		&Status{},
-		&ServerOpList{},
+		&OperationList{},
-		&ServerOp{},
+		&Operation{},
 		&Endpoints{},
 		&EndpointsList{},
 		&Binding{},
@@ -51,6 +51,8 @@ func init() {
 	// Legacy names are supported
 	Scheme.AddKnownTypeWithName("", "Minion", &Node{})
 	Scheme.AddKnownTypeWithName("", "MinionList", &NodeList{})
+	Scheme.AddKnownTypeWithName("", "ServerOp", &Operation{})
+	Scheme.AddKnownTypeWithName("", "ServerOpList", &OperationList{})
 }
 
 func (*PodContainerInfo) IsAnAPIObject()          {}
@@ -66,8 +68,8 @@ func (*Node) IsAnAPIObject()                      {}
 func (*NodeList) IsAnAPIObject()                  {}
 func (*Binding) IsAnAPIObject()                   {}
 func (*Status) IsAnAPIObject()                    {}
-func (*ServerOp) IsAnAPIObject()                  {}
+func (*Operation) IsAnAPIObject()                 {}
-func (*ServerOpList) IsAnAPIObject()              {}
+func (*OperationList) IsAnAPIObject()             {}
 func (*Event) IsAnAPIObject()                     {}
 func (*EventList) IsAnAPIObject()                 {}
 func (*ContainerManifest) IsAnAPIObject()         {}

pkg/api/types.go

@@ -476,6 +476,9 @@ type PodSpec struct {
 type PodStatus struct {
 	Phase PodPhase `json:"phase,omitempty"`
 
+	// A human readable message indicating details about why the pod is in this state.
+	Message string `json:"message,omitempty"`
+
 	// Host is the name of the node that this Pod is currently bound to, or empty if no
 	// assignment has been done.
 	Host   string `json:"host,omitempty"`
@@ -761,8 +764,8 @@ type Binding struct {
 // TODO: this could go in apiserver, but I'm including it here so clients needn't
 // import both.
 type Status struct {
-	TypeMeta   `json:",inline"`
+	TypeMeta `json:",inline"`
-	ObjectMeta `json:"metadata,omitempty"`
+	ListMeta `json:"metadata,omitempty"`
 
 	// One of: "Success", "Failure", "Working" (for operations not yet completed)
 	Status string `json:"status,omitempty"`
@@ -927,18 +930,18 @@ const (
 	CauseTypeFieldValueNotSupported CauseType = "FieldValueNotSupported"
 )
 
-// ServerOp is an operation delivered to API clients.
+// Operation is an operation delivered to API clients.
-type ServerOp struct {
+type Operation struct {
 	TypeMeta   `json:",inline"`
 	ObjectMeta `json:"metadata,omitempty"`
 }
 
-// ServerOpList is a list of operations, as delivered to API clients.
+// OperationList is a list of operations, as delivered to API clients.
-type ServerOpList struct {
+type OperationList struct {
 	TypeMeta `json:",inline"`
 	ListMeta `json:"metadata,omitempty"`
 
-	Items []ServerOp `json:"items"`
+	Items []Operation `json:"items"`
 }
 
 // ObjectReference contains enough information to let you inspect or modify the referred object.

pkg/api/v1beta1/conversion.go

@@ -176,6 +176,7 @@ func init() {
 			if err := s.Convert(&in.Info, &out.Info, 0); err != nil {
 				return err
 			}
+			out.Message = in.Message
 			out.Host = in.Host
 			out.HostIP = in.HostIP
 			out.PodIP = in.PodIP
@@ -189,6 +190,7 @@ func init() {
 				return err
 			}
 
+			out.Message = in.Message
 			out.Host = in.Host
 			out.HostIP = in.HostIP
 			out.PodIP = in.PodIP

pkg/api/v1beta1/register.go

@@ -28,6 +28,8 @@ func init() {
 	// Future names are supported, and declared first so they take precedence
 	api.Scheme.AddKnownTypeWithName("v1beta1", "Node", &Minion{})
 	api.Scheme.AddKnownTypeWithName("v1beta1", "NodeList", &MinionList{})
+	api.Scheme.AddKnownTypeWithName("v1beta1", "Operation", &ServerOp{})
+	api.Scheme.AddKnownTypeWithName("v1beta1", "OperationList", &ServerOpList{})
 
 	api.Scheme.AddKnownTypes("v1beta1",
 		&Pod{},

pkg/api/v1beta2/conversion.go

@@ -295,6 +295,7 @@ func init() {
 			if err := s.Convert(&in.Info, &out.Info, 0); err != nil {
 				return err
 			}
+			out.Message = in.Message
 			out.Host = in.Host
 			out.HostIP = in.HostIP
 			out.PodIP = in.PodIP
@@ -307,6 +308,7 @@ func init() {
 			if err := s.Convert(&in.Info, &out.Info, 0); err != nil {
 				return err
 			}
+			out.Message = in.Message
 			out.Host = in.Host
 			out.HostIP = in.HostIP
 			out.PodIP = in.PodIP

pkg/api/v1beta2/register.go

@@ -28,6 +28,8 @@ func init() {
 	// Future names are supported, and declared first so they take precedence
 	api.Scheme.AddKnownTypeWithName("v1beta2", "Node", &Minion{})
 	api.Scheme.AddKnownTypeWithName("v1beta2", "NodeList", &MinionList{})
+	api.Scheme.AddKnownTypeWithName("v1beta2", "Operation", &ServerOp{})
+	api.Scheme.AddKnownTypeWithName("v1beta2", "OperationList", &ServerOpList{})
 
 	api.Scheme.AddKnownTypes("v1beta2",
 		&Pod{},

pkg/api/v1beta3/register.go

@@ -52,6 +52,8 @@ func init() {
 	// Legacy names are supported
 	api.Scheme.AddKnownTypeWithName("v1beta3", "Minion", &Node{})
 	api.Scheme.AddKnownTypeWithName("v1beta3", "MinionList", &NodeList{})
+	api.Scheme.AddKnownTypeWithName("v1beta3", "ServerOp", &Operation{})
+	api.Scheme.AddKnownTypeWithName("v1beta3", "ServerOpList", &OperationList{})
 }
 
 func (*PodContainerInfo) IsAnAPIObject()          {}

pkg/apiserver/apiserver_test.go

@@ -70,15 +70,15 @@ func interfacesFor(version string) (*meta.VersionInterfaces, error) {
 func init() {
 	// Certain API objects are returned regardless of the contents of storage:
 	// api.Status is returned in errors
-	// api.ServerOp/api.ServerOpList are returned by /operations
+	// api.Operation/api.OperationList are returned by /operations
 
 	// "internal" version
 	api.Scheme.AddKnownTypes("", &Simple{}, &SimpleList{},
-		&api.Status{}, &api.ServerOp{}, &api.ServerOpList{})
+		&api.Status{}, &api.Operation{}, &api.OperationList{})
 	// "version" version
 	// TODO: Use versioned api objects?
 	api.Scheme.AddKnownTypes(testVersion, &Simple{}, &SimpleList{},
-		&api.Status{}, &api.ServerOp{}, &api.ServerOpList{})
+		&api.Status{}, &api.Operation{}, &api.OperationList{})
 
 	defMapper := meta.NewDefaultRESTMapper(
 		versions,

pkg/apiserver/operation.go

@@ -115,7 +115,7 @@ func (ops *Operations) insert(op *Operation) {
 }
 
 // List lists operations for an API client.
-func (ops *Operations) List() *api.ServerOpList {
+func (ops *Operations) List() *api.OperationList {
 	ops.lock.Lock()
 	defer ops.lock.Unlock()
 
@@ -124,9 +124,9 @@ func (ops *Operations) List() *api.ServerOpList {
 		ids = append(ids, id)
 	}
 	sort.StringSlice(ids).Sort()
-	ol := &api.ServerOpList{}
+	ol := &api.OperationList{}
 	for _, id := range ids {
-		ol.Items = append(ol.Items, api.ServerOp{ObjectMeta: api.ObjectMeta{Name: id}})
+		ol.Items = append(ol.Items, api.Operation{ObjectMeta: api.ObjectMeta{Name: id}})
 	}
 	return ol
 }

pkg/apiserver/operation_test.go

@@ -149,7 +149,7 @@ func TestOperationsList(t *testing.T) {
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}
-	oplist, ok := obj.(*api.ServerOpList)
+	oplist, ok := obj.(*api.OperationList)
 	if !ok {
 		t.Fatalf("expected ServerOpList, got %#v", obj)
 	}