diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go index 4f0b1272883..1f193621c9f 100644 --- a/pkg/api/serialization_test.go +++ b/pkg/api/serialization_test.go @@ -203,7 +203,7 @@ func TestList(t *testing.T) { api.Scheme.Log(nil) } -var nonRoundTrippableTypes = util.NewStringSet("ContainerManifest", "PodContainerInfo") +var nonRoundTrippableTypes = util.NewStringSet("ContainerManifest") var nonInternalRoundTrippableTypes = util.NewStringSet("List") func TestRoundTripTypes(t *testing.T) { diff --git a/pkg/api/v1beta1/register.go b/pkg/api/v1beta1/register.go index ad779eae716..ea6e667e9ef 100644 --- a/pkg/api/v1beta1/register.go +++ b/pkg/api/v1beta1/register.go @@ -31,6 +31,7 @@ func init() { api.Scheme.AddKnownTypes("v1beta1", &Pod{}, + &PodContainerInfo{}, &PodList{}, &ReplicationController{}, &ReplicationControllerList{}, @@ -58,6 +59,7 @@ func init() { } func (*Pod) IsAnAPIObject() {} +func (*PodContainerInfo) IsAnAPIObject() {} func (*PodList) IsAnAPIObject() {} func (*ReplicationController) IsAnAPIObject() {} func (*ReplicationControllerList) IsAnAPIObject() {} diff --git a/pkg/client/kubelet.go b/pkg/client/kubelet.go index 11090b13630..760b8c78279 100644 --- a/pkg/client/kubelet.go +++ b/pkg/client/kubelet.go @@ -20,7 +20,6 @@ import ( "errors" "fmt" "io/ioutil" - "log" "net" "net/http" "strconv" @@ -116,7 +115,6 @@ func (c *HTTPKubeletClient) GetPodInfo(host, podNamespace, podID string) (api.Po return info, err } // Check that this data can be unmarshalled - log.Printf("FOOO: %s", string(body)) err = latest.Codec.DecodeInto(body, &info) if err != nil { return info, err