@@ -1,10 +1,7 @@

 package test

 import (

-	"speter.net/go/exp/math/dec/inf"

-

 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

 )

@@ -59,10 +56,8 @@ func OkPodTemplate() *kapi.PodTemplateSpec {

 		Spec: kapi.PodSpec{

 			Containers: []kapi.Container{

 				{

-					Name:   "container1",

-					Image:  "registry:8080/repo1:ref1",

-					CPU:    resource.Quantity{Amount: inf.NewDec(0, 3), Format: "DecimalSI"},

-					Memory: resource.Quantity{Amount: inf.NewDec(0, 0), Format: "DecimalSI"},

+					Name:  "container1",

+					Image: "registry:8080/repo1:ref1",

 					Env: []kapi.EnvVar{

 						{

 							Name:  "ENV1",

@@ -71,10 +66,8 @@ func OkPodTemplate() *kapi.PodTemplateSpec {

 					},

 				},

 				{

-					Name:   "container2",

-					Image:  "registry:8080/repo1:ref2",

-					CPU:    resource.Quantity{Amount: inf.NewDec(0, 3), Format: "DecimalSI"},

-					Memory: resource.Quantity{Amount: inf.NewDec(0, 0), Format: "DecimalSI"},

+					Name:  "container2",

+					Image: "registry:8080/repo1:ref2",

 				},

 			},

 		},

@@ -1,6 +1,8 @@

 package controller

 import (

+	"fmt"

+

 	"github.com/golang/glog"

 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

@@ -184,6 +186,7 @@ func (dc *DeploymentController) makeDeploymentPod(deployment *kapi.ReplicationCo

 	pod := &kapi.Pod{

 		ObjectMeta: kapi.ObjectMeta{

+			GenerateName: fmt.Sprintf("deploy-%s-", deployment.Name),

 			Annotations: map[string]string{

 				deployapi.DeploymentAnnotation: deployment.Name,

 			},

@@ -4,11 +4,8 @@ import (

 	"strings"

 	"testing"

-	"speter.net/go/exp/math/dec/inf"

-

 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

 	kerrors "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"

 	api "github.com/openshift/origin/pkg/api/latest"

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

@@ -278,16 +275,12 @@ func basicPodTemplate() *kapi.PodTemplateSpec {

 		Spec: kapi.PodSpec{

 			Containers: []kapi.Container{

 				{

-					Name:   "container1",

-					Image:  "registry:8080/repo1:ref1",

-					CPU:    resource.Quantity{Amount: inf.NewDec(0, 3), Format: "DecimalSI"},

-					Memory: resource.Quantity{Amount: inf.NewDec(0, 0), Format: "DecimalSI"},

+					Name:  "container1",

+					Image: "registry:8080/repo1:ref1",

 				},

 				{

-					Name:   "container2",

-					Image:  "registry:8080/repo1:ref2",

-					CPU:    resource.Quantity{Amount: inf.NewDec(0, 3), Format: "DecimalSI"},

-					Memory: resource.Quantity{Amount: inf.NewDec(0, 0), Format: "DecimalSI"},

+					Name:  "container2",

+					Image: "registry:8080/repo1:ref2",

 				},

 			},

 		},

@@ -9,7 +9,7 @@ import (

 	"github.com/golang/glog"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"

+	//	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

@@ -24,10 +24,10 @@ func LatestDeploymentNameForConfig(config *deployapi.DeploymentConfig) string {

 // TODO: Resources are currently ignored due to the formats not surviving encoding/decoding

 // in a consistent manner (e.g. 0 is represented sometimes as 0.000)

 func HashPodSpec(t api.PodSpec) uint64 {

-	for i := range t.Containers {

+	/*for i := range t.Containers {

 		t.Containers[i].CPU = resource.Quantity{}

 		t.Containers[i].Memory = resource.Quantity{}

-	}

+	}*/

 	jsonString, err := json.Marshal(t)

 	if err != nil {

@@ -129,5 +129,5 @@ func ExampleProcessTemplateParameters() {

 	}

 	// Output:

 	//<nil>

-	//{"kind":"Config","apiVersion":"v1beta1","metadata":{"creationTimestamp":null},"items":[{"kind":"Route","apiVersion":"v1beta1","metadata":{"creationTimestamp":null},"host":"guestbook.example.com","serviceName":"frontend-service"},{"kind":"Service","id":"frontend-service","creationTimestamp":null,"apiVersion":"v1beta1","port":5432,"selector":{"name":"guestbook"},"containerPort":0},{"kind":"Service","id":"redis-master","creationTimestamp":null,"apiVersion":"v1beta1","port":10000,"selector":{"name":"redis-master"},"containerPort":0},{"kind":"Service","id":"redis-slave","creationTimestamp":null,"apiVersion":"v1beta1","port":10001,"selector":{"name":"redis-slave"},"containerPort":0},{"kind":"Pod","id":"redis-master","creationTimestamp":null,"apiVersion":"v1beta1","labels":{"name":"redis-master"},"desiredState":{"manifest":{"version":"v1beta2","id":"","volumes":null,"containers":[{"name":"master","image":"dockerfile/redis","ports":[{"containerPort":6379}],"env":[{"name":"REDIS_PASSWORD","key":"REDIS_PASSWORD","value":"P8vxbV4C"}],"imagePullPolicy":"","capabilities":{}}],"restartPolicy":{}}},"currentState":{"manifest":{"version":"","id":"","volumes":null,"containers":null,"restartPolicy":{}}}},{"kind":"ReplicationController","id":"guestbook","creationTimestamp":null,"apiVersion":"v1beta1","desiredState":{"replicas":3,"replicaSelector":{"name":"frontend-service"},"podTemplate":{"desiredState":{"manifest":{"version":"v1beta2","id":"","volumes":null,"containers":[{"name":"php-redis","image":"brendanburns/php-redis","ports":[{"hostPort":8000,"containerPort":80}],"env":[{"name":"ADMIN_USERNAME","key":"ADMIN_USERNAME","value":"adminQ3H"},{"name":"ADMIN_PASSWORD","key":"ADMIN_PASSWORD","value":"dwNJiJwW"},{"name":"REDIS_PASSWORD","key":"REDIS_PASSWORD","value":"P8vxbV4C"}],"imagePullPolicy":"","capabilities":{}}],"restartPolicy":{}}},"labels":{"name":"frontend-service"}}},"currentState":{"replicas":0,"podTemplate":{"desiredState":{"manifest":{"version":"","id":"","volumes":null,"containers":null,"restartPolicy":{}}}}}},{"kind":"ReplicationController","id":"redis-slave","creationTimestamp":null,"apiVersion":"v1beta1","desiredState":{"replicas":2,"replicaSelector":{"name":"redis-slave"},"podTemplate":{"desiredState":{"manifest":{"version":"v1beta2","id":"","volumes":null,"containers":[{"name":"slave","image":"brendanburns/redis-slave","ports":[{"hostPort":6380,"containerPort":6379}],"env":[{"name":"REDIS_PASSWORD","key":"REDIS_PASSWORD","value":"P8vxbV4C"}],"imagePullPolicy":"","capabilities":{}}],"restartPolicy":{}}},"labels":{"name":"redis-slave"}}},"currentState":{"replicas":0,"podTemplate":{"desiredState":{"manifest":{"version":"","id":"","volumes":null,"containers":null,"restartPolicy":{}}}}}}]}

+	//{"kind":"Config","apiVersion":"v1beta1","metadata":{"creationTimestamp":null},"items":[{"kind":"Route","apiVersion":"v1beta1","metadata":{"creationTimestamp":null},"host":"guestbook.example.com","serviceName":"frontend-service"},{"kind":"Service","id":"frontend-service","creationTimestamp":null,"apiVersion":"v1beta1","port":5432,"selector":{"name":"guestbook"},"containerPort":0},{"kind":"Service","id":"redis-master","creationTimestamp":null,"apiVersion":"v1beta1","port":10000,"selector":{"name":"redis-master"},"containerPort":0},{"kind":"Service","id":"redis-slave","creationTimestamp":null,"apiVersion":"v1beta1","port":10001,"selector":{"name":"redis-slave"},"containerPort":0},{"kind":"Pod","id":"redis-master","creationTimestamp":null,"apiVersion":"v1beta1","labels":{"name":"redis-master"},"desiredState":{"manifest":{"version":"v1beta2","id":"","volumes":null,"containers":[{"name":"master","image":"dockerfile/redis","ports":[{"containerPort":6379}],"env":[{"name":"REDIS_PASSWORD","key":"REDIS_PASSWORD","value":"P8vxbV4C"}],"resources":{},"imagePullPolicy":"","capabilities":{}}],"restartPolicy":{}}},"currentState":{"manifest":{"version":"","id":"","volumes":null,"containers":null,"restartPolicy":{}}}},{"kind":"ReplicationController","id":"guestbook","creationTimestamp":null,"apiVersion":"v1beta1","desiredState":{"replicas":3,"replicaSelector":{"name":"frontend-service"},"podTemplate":{"desiredState":{"manifest":{"version":"v1beta2","id":"","volumes":null,"containers":[{"name":"php-redis","image":"brendanburns/php-redis","ports":[{"hostPort":8000,"containerPort":80}],"env":[{"name":"ADMIN_USERNAME","key":"ADMIN_USERNAME","value":"adminQ3H"},{"name":"ADMIN_PASSWORD","key":"ADMIN_PASSWORD","value":"dwNJiJwW"},{"name":"REDIS_PASSWORD","key":"REDIS_PASSWORD","value":"P8vxbV4C"}],"resources":{},"imagePullPolicy":"","capabilities":{}}],"restartPolicy":{}}},"labels":{"name":"frontend-service"}}},"currentState":{"replicas":0,"podTemplate":{"desiredState":{"manifest":{"version":"","id":"","volumes":null,"containers":null,"restartPolicy":{}}}}}},{"kind":"ReplicationController","id":"redis-slave","creationTimestamp":null,"apiVersion":"v1beta1","desiredState":{"replicas":2,"replicaSelector":{"name":"redis-slave"},"podTemplate":{"desiredState":{"manifest":{"version":"v1beta2","id":"","volumes":null,"containers":[{"name":"slave","image":"brendanburns/redis-slave","ports":[{"hostPort":6380,"containerPort":6379}],"env":[{"name":"REDIS_PASSWORD","key":"REDIS_PASSWORD","value":"P8vxbV4C"}],"resources":{},"imagePullPolicy":"","capabilities":{}}],"restartPolicy":{}}},"labels":{"name":"redis-slave"}}},"currentState":{"replicas":0,"podTemplate":{"desiredState":{"manifest":{"version":"","id":"","volumes":null,"containers":null,"restartPolicy":{}}}}}}]}

 }