Read BoundPods from etcd instead of ContainerManifestList

There are three values that uniquely identify a pod on a host -
the configuration source (etcd, file, http), the pod name, and the
pod namespace. This change ensures that configuration properly
makes those names unique by changing podFullName to contain both
name (currently ID in v1beta1, Name in v1beta3) and namespace.

The Kubelet does not properly handle information requests for
pods not in the default namespace at this time.

pkg/api/conversion.go

@@ -17,9 +17,49 @@ limitations under the License.
 package api
 
 import (
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
 )
 
 // Codec is the identity codec for this package - it can only convert itself
 // to itself.
 var Codec = runtime.CodecFor(Scheme, "")
+
+func init() {
+	Scheme.AddConversionFuncs(
+		// Convert ContainerManifest to BoundPod
+		func(in *ContainerManifest, out *BoundPod, s conversion.Scope) error {
+			out.Spec.Containers = in.Containers
+			out.Spec.Volumes = in.Volumes
+			out.Spec.RestartPolicy = in.RestartPolicy
+			out.ID = in.ID
+			out.UID = in.UUID
+			return nil
+		},
+		func(in *BoundPod, out *ContainerManifest, s conversion.Scope) error {
+			out.Containers = in.Spec.Containers
+			out.Volumes = in.Spec.Volumes
+			out.RestartPolicy = in.Spec.RestartPolicy
+			out.Version = "v1beta2"
+			out.ID = in.ID
+			out.UUID = in.UID
+			return nil
+		},
+		func(in *ContainerManifestList, out *BoundPods, s conversion.Scope) error {
+			if err := s.Convert(&in.Items, &out.Items, 0); err != nil {
+				return err
+			}
+			for i := range out.Items {
+				item := &out.Items[i]
+				item.ResourceVersion = in.ResourceVersion
+			}
+			return nil
+		},
+		func(in *BoundPods, out *ContainerManifestList, s conversion.Scope) error {
+			if err := s.Convert(&in.Items, &out.Items, 0); err != nil {
+				return err
+			}
+			out.ResourceVersion = in.ResourceVersion
+			return nil
+		})
+}