Merge pull request #1961 from smarterclayton/rename_id_to_name

cmd/e2e/e2e.go

@@ -111,15 +111,15 @@ func TestPodUpdate(c *client.Client) bool {
 		glog.Errorf("Failed to create pod: %v", err)
 		return false
 	}
-	defer c.DeletePod(ctx, pod.ID)
-	waitForPodRunning(c, pod.ID)
+	defer c.DeletePod(ctx, pod.Name)
+	waitForPodRunning(c, pod.Name)
 	pods, err := c.ListPods(ctx, labels.SelectorFromSet(labels.Set(map[string]string{"time": value})))
 	if len(pods.Items) != 1 {
 		glog.Errorf("Failed to find the correct pod")
 		return false
 	}
 
-	podOut, err := c.GetPod(ctx, pod.ID)
+	podOut, err := c.GetPod(ctx, pod.Name)
 	if err != nil {
 		glog.Errorf("Failed to get pod: %v", err)
 		return false
@@ -133,7 +133,7 @@ func TestPodUpdate(c *client.Client) bool {
 		glog.Errorf("Failed to update pod: %v", err)
 		return false
 	}
-	waitForPodRunning(c, pod.ID)
+	waitForPodRunning(c, pod.Name)
 	pods, err = c.ListPods(ctx, labels.SelectorFromSet(labels.Set(map[string]string{"time": value})))
 	if len(pods.Items) != 1 {
 		glog.Errorf("Failed to find the correct pod after update.")

cmd/integration/integration.go

@@ -184,7 +184,7 @@ func podsOnMinions(c *client.Client, pods api.PodList) wait.ConditionFunc {
 	podInfo := fakePodInfoGetter{}
 	return func() (bool, error) {
 		for i := range pods.Items {
-			host, id, namespace := pods.Items[i].CurrentState.Host, pods.Items[i].ID, pods.Items[i].Namespace
+			host, id, namespace := pods.Items[i].CurrentState.Host, pods.Items[i].Name, pods.Items[i].Namespace
 			if len(host) == 0 {
 				return false, nil
 			}
@@ -251,7 +251,7 @@ func runAtomicPutTest(c *client.Client) {
 	var svc api.Service
 	err := c.Post().Path("services").Body(
 		&api.Service{
-			TypeMeta: api.TypeMeta{ID: "atomicservice", APIVersion: latest.Version},
+			TypeMeta: api.TypeMeta{Name: "atomicservice", APIVersion: latest.Version},
 			Port:     12345,
 			Labels: map[string]string{
 				"name": "atomicService",
@@ -282,7 +282,7 @@ func runAtomicPutTest(c *client.Client) {
 				var tmpSvc api.Service
 				err := c.Get().
 					Path("services").
-					Path(svc.ID).
+					Path(svc.Name).
 					PollPeriod(100 * time.Millisecond).
 					Do().
 					Into(&tmpSvc)
@@ -296,7 +296,7 @@ func runAtomicPutTest(c *client.Client) {
 					tmpSvc.Selector[l] = v
 				}
 				glog.Infof("Posting update (%s, %s)", l, v)
-				err = c.Put().Path("services").Path(svc.ID).Body(&tmpSvc).Do().Error()
+				err = c.Put().Path("services").Path(svc.Name).Body(&tmpSvc).Do().Error()
 				if err != nil {
 					if errors.IsConflict(err) {
 						glog.Infof("Conflict: (%s, %s)", l, v)
@@ -313,7 +313,7 @@ func runAtomicPutTest(c *client.Client) {
 		}(label, value)
 	}
 	wg.Wait()
-	if err := c.Get().Path("services").Path(svc.ID).Do().Into(&svc); err != nil {
+	if err := c.Get().Path("services").Path(svc.Name).Do().Into(&svc); err != nil {
 		glog.Fatalf("Failed getting atomicService after writers are complete: %v", err)
 	}
 	if !reflect.DeepEqual(testLabels, labels.Set(svc.Selector)) {
@@ -325,7 +325,7 @@ func runAtomicPutTest(c *client.Client) {
 func runServiceTest(client *client.Client) {
 	ctx := api.NewDefaultContext()
 	pod := api.Pod{
-		TypeMeta: api.TypeMeta{ID: "foo"},
+		TypeMeta: api.TypeMeta{Name: "foo"},
 		DesiredState: api.PodState{
 			Manifest: api.ContainerManifest{
 				Version: "v1beta1",
@@ -351,11 +351,11 @@ func runServiceTest(client *client.Client) {
 	if err != nil {
 		glog.Fatalf("Failed to create pod: %v, %v", pod, err)
 	}
-	if err := wait.Poll(time.Second, time.Second*20, podExists(client, ctx, pod.ID)); err != nil {
+	if err := wait.Poll(time.Second, time.Second*20, podExists(client, ctx, pod.Name)); err != nil {
 		glog.Fatalf("FAILED: pod never started running %v", err)
 	}
 	svc1 := api.Service{
-		TypeMeta: api.TypeMeta{ID: "service1"},
+		TypeMeta: api.TypeMeta{Name: "service1"},
 		Selector: map[string]string{
 			"name": "thisisalonglabel",
 		},
@@ -365,12 +365,12 @@ func runServiceTest(client *client.Client) {
 	if err != nil {
 		glog.Fatalf("Failed to create service: %v, %v", svc1, err)
 	}
-	if err := wait.Poll(time.Second, time.Second*20, endpointsSet(client, ctx, svc1.ID, 1)); err != nil {
+	if err := wait.Poll(time.Second, time.Second*20, endpointsSet(client, ctx, svc1.Name, 1)); err != nil {
 		glog.Fatalf("FAILED: unexpected endpoints: %v", err)
 	}
 	// A second service with the same port.
 	svc2 := api.Service{
-		TypeMeta: api.TypeMeta{ID: "service2"},
+		TypeMeta: api.TypeMeta{Name: "service2"},
 		Selector: map[string]string{
 			"name": "thisisalonglabel",
 		},
@@ -380,7 +380,7 @@ func runServiceTest(client *client.Client) {
 	if err != nil {
 		glog.Fatalf("Failed to create service: %v, %v", svc2, err)
 	}
-	if err := wait.Poll(time.Second, time.Second*20, endpointsSet(client, ctx, svc2.ID, 1)); err != nil {
+	if err := wait.Poll(time.Second, time.Second*20, endpointsSet(client, ctx, svc2.Name, 1)); err != nil {
 		glog.Fatalf("FAILED: unexpected endpoints: %v", err)
 	}
 	glog.Info("Service test passed.")

pkg/api/conversion.go

@@ -32,7 +32,7 @@ func init() {
 			out.Spec.Containers = in.Containers
 			out.Spec.Volumes = in.Volumes
 			out.Spec.RestartPolicy = in.RestartPolicy
-			out.ID = in.ID
+			out.Name = in.ID
 			out.UID = in.UUID
 			return nil
 		},
@@ -41,7 +41,7 @@ func init() {
 			out.Volumes = in.Spec.Volumes
 			out.RestartPolicy = in.Spec.RestartPolicy
 			out.Version = "v1beta2"
-			out.ID = in.ID
+			out.ID = in.Name
 			out.UUID = in.UID
 			return nil
 		},
@@ -71,7 +71,7 @@ func init() {
 			// Only copy a subset of fields, and override manifest attributes with the pod
 			// metadata
 			out.UID = in.UID
-			out.ID = in.ID
+			out.Name = in.Name
 			out.Namespace = in.Namespace
 			out.CreationTimestamp = in.CreationTimestamp
 			return nil

pkg/api/latest/latest_test.go

@@ -37,7 +37,7 @@ var apiObjectFuzzer = fuzz.New().NilChance(.5).NumElements(1, 1).Funcs(
 		// APIVersion and Kind must remain blank in memory.
 		j.APIVersion = ""
 		j.Kind = ""
-		j.ID = c.RandString()
+		j.Name = c.RandString()
 		// TODO: Fix JSON/YAML packages and/or write custom encoding
 		// for uint64's. Somehow the LS *byte* of this is lost, but
 		// only when all 8 bytes are set.

pkg/api/ref_test.go

@@ -36,7 +36,7 @@ func TestGetReference(t *testing.T) {
 		"pod": {
 			obj: &Pod{
 				TypeMeta: TypeMeta{
-					ID:              "foo",
+					Name:            "foo",
 					ResourceVersion: "42",
 					SelfLink:        "/api/v1beta1/pods/foo",
 				},
@@ -52,7 +52,7 @@ func TestGetReference(t *testing.T) {
 		"serviceList": {
 			obj: &ServiceList{
 				TypeMeta: TypeMeta{
-					ID:              "foo",
+					Name:            "foo",
 					ResourceVersion: "42",
 					SelfLink:        "/api/v1beta2/services",
 				},
@@ -68,7 +68,7 @@ func TestGetReference(t *testing.T) {
 		"badSelfLink": {
 			obj: &ServiceList{
 				TypeMeta: TypeMeta{
-					ID:              "foo",
+					Name:            "foo",
 					ResourceVersion: "42",
 					SelfLink:        "v1beta2/services",
 				},

pkg/api/serialization_test.go

@@ -46,7 +46,7 @@ var apiObjectFuzzer = fuzz.New().NilChance(.5).NumElements(1, 1).Funcs(
 		// APIVersion and Kind must remain blank in memory.
 		j.APIVersion = ""
 		j.Kind = ""
-		j.ID = c.RandString()
+		j.Name = c.RandString()
 		// TODO: Fix JSON/YAML packages and/or write custom encoding
 		// for uint64's. Somehow the LS *byte* of this is lost, but
 		// only when all 8 bytes are set.
@@ -63,7 +63,7 @@ var apiObjectFuzzer = fuzz.New().NilChance(.5).NumElements(1, 1).Funcs(
 		// APIVersion and Kind must remain blank in memory.
 		j.APIVersion = ""
 		j.Kind = ""
-		j.ID = c.RandString()
+		j.Name = c.RandString()
 		// TODO: Fix JSON/YAML packages and/or write custom encoding
 		// for uint64's. Somehow the LS *byte* of this is lost, but
 		// only when all 8 bytes are set.

pkg/api/types.go

@@ -245,7 +245,7 @@ type Lifecycle struct {
 // TypeMeta is shared by all objects sent to, or returned from the client.
 type TypeMeta struct {
 	Kind              string    `json:"kind,omitempty" yaml:"kind,omitempty"`
-	ID                string    `json:"id,omitempty" yaml:"id,omitempty"`
+	Name              string    `json:"name,omitempty" yaml:"name,omitempty"`
 	CreationTimestamp util.Time `json:"creationTimestamp,omitempty" yaml:"creationTimestamp,omitempty"`
 	SelfLink          string    `json:"selfLink,omitempty" yaml:"selfLink,omitempty"`
 	ResourceVersion   string    `json:"resourceVersion,omitempty" yaml:"resourceVersion,omitempty"`
@@ -458,7 +458,7 @@ type ResourceName string
 type ResourceList map[ResourceName]util.IntOrString
 
 // Minion is a worker node in Kubernetenes.
-// The name of the minion according to etcd is in TypeMeta.ID.
+// The name of the minion according to etcd is in ID.
 type Minion struct {
 	TypeMeta `json:",inline" yaml:",inline"`
 	// Queried from cloud provider, if available.

pkg/api/v1beta1/conversion.go

@@ -30,7 +30,7 @@ func init() {
 			out.APIVersion = in.APIVersion
 			out.Kind = in.Kind
 			out.Namespace = in.Namespace
-			out.ID = in.ID
+			out.ID = in.Name
 			out.CreationTimestamp = in.CreationTimestamp
 			out.SelfLink = in.SelfLink
 			out.Annotations = in.Annotations
@@ -48,7 +48,7 @@ func init() {
 			out.APIVersion = in.APIVersion
 			out.Kind = in.Kind
 			out.Namespace = in.Namespace
-			out.ID = in.ID
+			out.Name = in.ID
 			out.CreationTimestamp = in.CreationTimestamp
 			out.SelfLink = in.SelfLink
 			out.Annotations = in.Annotations

pkg/api/v1beta1/conversion_test.go

@@ -119,7 +119,7 @@ func TestMinionListConversionToNew(t *testing.T) {
 		return v1beta1.Minion{TypeMeta: v1beta1.TypeMeta{ID: id}}
 	}
 	newMinion := func(id string) newer.Minion {
-		return newer.Minion{TypeMeta: newer.TypeMeta{ID: id}}
+		return newer.Minion{TypeMeta: newer.TypeMeta{Name: id}}
 	}
 	oldMinions := []v1beta1.Minion{
 		oldMinion("foo"),
@@ -166,7 +166,7 @@ func TestMinionListConversionToOld(t *testing.T) {
 		return v1beta1.Minion{TypeMeta: v1beta1.TypeMeta{ID: id}}
 	}
 	newMinion := func(id string) newer.Minion {
-		return newer.Minion{TypeMeta: newer.TypeMeta{ID: id}}
+		return newer.Minion{TypeMeta: newer.TypeMeta{Name: id}}
 	}
 	oldMinions := []v1beta1.Minion{
 		oldMinion("foo"),

pkg/api/v1beta1/types.go

@@ -484,7 +484,7 @@ type ResourceName string
 type ResourceList map[ResourceName]util.IntOrString
 
 // Minion is a worker node in Kubernetenes.
-// The name of the minion according to etcd is in TypeMeta.ID.
+// The name of the minion according to etcd is in ID.
 type Minion struct {
 	TypeMeta `json:",inline" yaml:",inline"`
 	// Queried from cloud provider, if available.

pkg/api/v1beta2/conversion.go

@@ -30,7 +30,7 @@ func init() {
 			out.APIVersion = in.APIVersion
 			out.Kind = in.Kind
 			out.Namespace = in.Namespace
-			out.ID = in.ID
+			out.ID = in.Name
 			out.CreationTimestamp = in.CreationTimestamp
 			out.SelfLink = in.SelfLink
 			out.Annotations = in.Annotations
@@ -48,7 +48,7 @@ func init() {
 			out.APIVersion = in.APIVersion
 			out.Kind = in.Kind
 			out.Namespace = in.Namespace
-			out.ID = in.ID
+			out.Name = in.ID
 			out.CreationTimestamp = in.CreationTimestamp
 			out.SelfLink = in.SelfLink
 			out.Annotations = in.Annotations

pkg/api/v1beta2/types.go

@@ -449,7 +449,7 @@ type ResourceName string
 type ResourceList map[ResourceName]util.IntOrString
 
 // Minion is a worker node in Kubernetenes.
-// The name of the minion according to etcd is in TypeMeta.ID.
+// The name of the minion according to etcd is in ID.
 type Minion struct {
 	TypeMeta `json:",inline" yaml:",inline"`
 	// Queried from cloud provider, if available.

pkg/api/v1beta3/types.go

@@ -657,7 +657,7 @@ type ResourceName string
 type ResourceList map[ResourceName]util.IntOrString
 
 // Node is a worker node in Kubernetenes.
-// The name of the node according to etcd is in TypeMeta.ID.
+// The name of the node according to etcd is in ID.
 type Node struct {
 	TypeMeta `json:",inline" yaml:",inline"`
 	Metadata ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`

pkg/api/validation/validation.go

@@ -332,8 +332,8 @@ func ValidatePodState(podState *api.PodState) errs.ErrorList {
 // ValidatePod tests if required fields in the pod are set.
 func ValidatePod(pod *api.Pod) errs.ErrorList {
 	allErrs := errs.ErrorList{}
-	if len(pod.ID) == 0 {
-		allErrs = append(allErrs, errs.NewFieldRequired("id", pod.ID))
+	if len(pod.Name) == 0 {
+		allErrs = append(allErrs, errs.NewFieldRequired("name", pod.Name))
 	}
 	if !util.IsDNSSubdomain(pod.Namespace) {
 		allErrs = append(allErrs, errs.NewFieldInvalid("namespace", pod.Namespace))
@@ -346,8 +346,8 @@ func ValidatePod(pod *api.Pod) errs.ErrorList {
 func ValidatePodUpdate(newPod, oldPod *api.Pod) errs.ErrorList {
 	allErrs := errs.ErrorList{}
 
-	if newPod.ID != oldPod.ID {
-		allErrs = append(allErrs, errs.NewFieldInvalid("ID", newPod.ID))
+	if newPod.Name != oldPod.Name {
+		allErrs = append(allErrs, errs.NewFieldInvalid("name", newPod.Name))
 	}
 
 	if len(newPod.DesiredState.Manifest.Containers) != len(oldPod.DesiredState.Manifest.Containers) {
@@ -373,10 +373,10 @@ func ValidatePodUpdate(newPod, oldPod *api.Pod) errs.ErrorList {
 // ValidateService tests if required fields in the service are set.
 func ValidateService(service *api.Service) errs.ErrorList {
 	allErrs := errs.ErrorList{}
-	if len(service.ID) == 0 {
-		allErrs = append(allErrs, errs.NewFieldRequired("id", service.ID))
-	} else if !util.IsDNS952Label(service.ID) {
-		allErrs = append(allErrs, errs.NewFieldInvalid("id", service.ID))
+	if len(service.Name) == 0 {
+		allErrs = append(allErrs, errs.NewFieldRequired("name", service.Name))
+	} else if !util.IsDNS952Label(service.Name) {
+		allErrs = append(allErrs, errs.NewFieldInvalid("name", service.Name))
 	}
 	if !util.IsDNSSubdomain(service.Namespace) {
 		allErrs = append(allErrs, errs.NewFieldInvalid("namespace", service.Namespace))
@@ -398,8 +398,8 @@ func ValidateService(service *api.Service) errs.ErrorList {
 // ValidateReplicationController tests if required fields in the replication controller are set.
 func ValidateReplicationController(controller *api.ReplicationController) errs.ErrorList {
 	allErrs := errs.ErrorList{}
-	if len(controller.ID) == 0 {
-		allErrs = append(allErrs, errs.NewFieldRequired("id", controller.ID))
+	if len(controller.Name) == 0 {
+		allErrs = append(allErrs, errs.NewFieldRequired("name", controller.Name))
 	}
 	if !util.IsDNSSubdomain(controller.Namespace) {
 		allErrs = append(allErrs, errs.NewFieldInvalid("namespace", controller.Namespace))
@@ -440,15 +440,15 @@ func ValidateReadOnlyPersistentDisks(volumes []api.Volume) errs.ErrorList {
 
 // ValidateBoundPod tests if required fields on a bound pod are set.
 func ValidateBoundPod(pod *api.BoundPod) (errors []error) {
-	if !util.IsDNSSubdomain(pod.ID) {
-		errors = append(errors, errs.NewFieldInvalid("id", pod.ID))
+	if !util.IsDNSSubdomain(pod.Name) {
+		errors = append(errors, errs.NewFieldInvalid("name", pod.Name))
 	}
 	if !util.IsDNSSubdomain(pod.Namespace) {
 		errors = append(errors, errs.NewFieldInvalid("namespace", pod.Namespace))
 	}
 	containerManifest := &api.ContainerManifest{
 		Version:       "v1beta2",
-		ID:            pod.ID,
+		ID:            pod.Name,
 		UUID:          pod.UID,
 		Containers:    pod.Spec.Containers,
 		Volumes:       pod.Spec.Volumes,

pkg/apiserver/apiserver_test.go

@@ -54,7 +54,7 @@ func init() {
 
 type Simple struct {
 	api.TypeMeta `yaml:",inline" json:",inline"`
-	Name         string `yaml:"name,omitempty" json:"name,omitempty"`
+	Other        string `yaml:"other,omitempty" json:"other,omitempty"`
 }
 
 func (*Simple) IsAnAPIObject() {}
@@ -108,7 +108,7 @@ func (storage *SimpleRESTStorage) Delete(ctx api.Context, id string) (<-chan run
 	}
 	return MakeAsync(func() (runtime.Object, error) {
 		if storage.injectedFunction != nil {
-			return storage.injectedFunction(&Simple{TypeMeta: api.TypeMeta{ID: id}})
+			return storage.injectedFunction(&Simple{TypeMeta: api.TypeMeta{Name: id}})
 		}
 		return &api.Status{Status: api.StatusSuccess}, nil
 	}), nil
@@ -295,7 +295,7 @@ func TestNonEmptyList(t *testing.T) {
 		list: []Simple{
 			{
 				TypeMeta: api.TypeMeta{Kind: "Simple"},
-				Name:     "foo",
+				Other:    "foo",
 			},
 		},
 	}
@@ -322,7 +322,7 @@ func TestNonEmptyList(t *testing.T) {
 		t.Errorf("Unexpected response: %#v", listOut)
 		return
 	}
-	if listOut.Items[0].Name != simpleStorage.list[0].Name {
+	if listOut.Items[0].Other != simpleStorage.list[0].Other {
 		t.Errorf("Unexpected data: %#v, %s", listOut.Items[0], string(body))
 	}
 }
@@ -331,7 +331,7 @@ func TestGet(t *testing.T) {
 	storage := map[string]RESTStorage{}
 	simpleStorage := SimpleRESTStorage{
 		item: Simple{
-			Name: "foo",
+			Other: "foo",
 		},
 	}
 	selfLinker := &setTestSelfLinker{
@@ -431,7 +431,7 @@ func TestUpdate(t *testing.T) {
 	server := httptest.NewServer(handler)
 
 	item := &Simple{
-		Name: "bar",
+		Other: "bar",
 	}
 	body, err := codec.Encode(item)
 	if err != nil {
@@ -464,7 +464,7 @@ func TestUpdateMissing(t *testing.T) {
 	server := httptest.NewServer(handler)
 
 	item := &Simple{
-		Name: "bar",
+		Other: "bar",
 	}
 	body, err := codec.Encode(item)
 	if err != nil {
@@ -493,7 +493,7 @@ func TestCreate(t *testing.T) {
 	client := http.Client{}
 
 	simple := &Simple{
-		Name: "foo",
+		Other: "foo",
 	}
 	data, _ := codec.Encode(simple)
 	request, err := http.NewRequest("POST", server.URL+"/prefix/version/foo", bytes.NewBuffer(data))
@@ -532,7 +532,7 @@ func TestCreateNotFound(t *testing.T) {
 	server := httptest.NewServer(handler)
 	client := http.Client{}
 
-	simple := &Simple{Name: "foo"}
+	simple := &Simple{Other: "foo"}
 	data, _ := codec.Encode(simple)
 	request, err := http.NewRequest("POST", server.URL+"/prefix/version/simple", bytes.NewBuffer(data))
 	if err != nil {
@@ -597,7 +597,7 @@ func TestSyncCreate(t *testing.T) {
 	client := http.Client{}
 
 	simple := &Simple{
-		Name: "bar",
+		Other: "bar",
 	}
 	data, _ := codec.Encode(simple)
 	request, err := http.NewRequest("POST", server.URL+"/prefix/version/foo?sync=true", bytes.NewBuffer(data))
@@ -691,7 +691,7 @@ func TestAsyncCreateError(t *testing.T) {
 	handler.(*defaultAPIServer).group.handler.asyncOpWait = 0
 	server := httptest.NewServer(handler)
 
-	simple := &Simple{Name: "bar"}
+	simple := &Simple{Other: "bar"}
 	data, _ := codec.Encode(simple)
 
 	status := expectApiStatus(t, "POST", fmt.Sprintf("%s/prefix/version/foo", server.URL), data, http.StatusAccepted)
@@ -787,7 +787,7 @@ func TestSyncCreateTimeout(t *testing.T) {
 	}, codec, "/prefix/version", selfLinker)
 	server := httptest.NewServer(handler)
 
-	simple := &Simple{Name: "foo"}
+	simple := &Simple{Other: "foo"}
 	data, _ := codec.Encode(simple)
 	itemOut := expectApiStatus(t, "POST", server.URL+"/prefix/version/foo?sync=true&timeout=4ms", data, http.StatusAccepted)
 	if itemOut.Status != api.StatusWorking || itemOut.Details == nil || itemOut.Details.ID == "" {

pkg/apiserver/operation.go

@@ -125,7 +125,7 @@ func (ops *Operations) List() *api.ServerOpList {
 	sort.StringSlice(ids).Sort()
 	ol := &api.ServerOpList{}
 	for _, id := range ids {
-		ol.Items = append(ol.Items, api.ServerOp{TypeMeta: api.TypeMeta{ID: id}})
+		ol.Items = append(ol.Items, api.ServerOp{TypeMeta: api.TypeMeta{Name: id}})
 	}
 	return ol
 }

pkg/apiserver/operation_test.go

@@ -43,7 +43,7 @@ func TestOperation(t *testing.T) {
 	time.Sleep(time.Millisecond)
 	go func() {
 		time.Sleep(500 * time.Millisecond)
-		c <- &Simple{TypeMeta: api.TypeMeta{ID: "All done"}}
+		c <- &Simple{TypeMeta: api.TypeMeta{Name: "All done"}}
 	}()
 
 	if op.expired(time.Now().Add(-time.Minute)) {
@@ -96,7 +96,7 @@ func TestOperation(t *testing.T) {
 		t.Errorf("expire failed to remove the operation %#v", ops)
 	}
 
-	if op.result.(*Simple).ID != "All done" {
+	if op.result.(*Simple).Name != "All done" {
 		t.Errorf("Got unexpected result: %#v", op.result)
 	}
 }
@@ -119,7 +119,7 @@ func TestOperationsList(t *testing.T) {
 	client := http.Client{}
 
 	simple := &Simple{
-		Name: "foo",
+		TypeMeta: api.TypeMeta{Name: "foo"},
 	}
 	data, err := codec.Encode(simple)
 	if err != nil {
@@ -175,7 +175,7 @@ func TestOpGet(t *testing.T) {
 	client := http.Client{}
 
 	simple := &Simple{
-		Name: "foo",
+		TypeMeta: api.TypeMeta{Name: "foo"},
 	}
 	data, err := codec.Encode(simple)
 	t.Log(string(data))

pkg/apiserver/watch_test.go

@@ -39,9 +39,9 @@ var watchTestTable = []struct {
 	t   watch.EventType
 	obj runtime.Object
 }{
-	{watch.Added, &Simple{Name: "A Name"}},
-	{watch.Modified, &Simple{Name: "Another Name"}},
-	{watch.Deleted, &Simple{Name: "Another Name"}},
+	{watch.Added, &Simple{Other: "A Name"}},
+	{watch.Modified, &Simple{Other: "Another Name"}},
+	{watch.Deleted, &Simple{Other: "Another Name"}},
 }
 
 func TestWatchWebsocket(t *testing.T) {

pkg/client/cache/reflector_test.go

@@ -54,13 +54,13 @@ func TestReflector_watchHandler(t *testing.T) {
 	s := NewStore()
 	g := NewReflector(&testLW{}, &api.Pod{}, s)
 	fw := watch.NewFake()
-	s.Add("foo", &api.Pod{TypeMeta: api.TypeMeta{ID: "foo"}})
-	s.Add("bar", &api.Pod{TypeMeta: api.TypeMeta{ID: "bar"}})
+	s.Add("foo", &api.Pod{TypeMeta: api.TypeMeta{Name: "foo"}})
+	s.Add("bar", &api.Pod{TypeMeta: api.TypeMeta{Name: "bar"}})
 	go func() {
-		fw.Add(&api.Service{TypeMeta: api.TypeMeta{ID: "rejected"}})
-		fw.Delete(&api.Pod{TypeMeta: api.TypeMeta{ID: "foo"}})
-		fw.Modify(&api.Pod{TypeMeta: api.TypeMeta{ID: "bar", ResourceVersion: "55"}})
-		fw.Add(&api.Pod{TypeMeta: api.TypeMeta{ID: "baz", ResourceVersion: "32"}})
+		fw.Add(&api.Service{TypeMeta: api.TypeMeta{Name: "rejected"}})
+		fw.Delete(&api.Pod{TypeMeta: api.TypeMeta{Name: "foo"}})
+		fw.Modify(&api.Pod{TypeMeta: api.TypeMeta{Name: "bar", ResourceVersion: "55"}})
+		fw.Add(&api.Pod{TypeMeta: api.TypeMeta{Name: "baz", ResourceVersion: "32"}})
 		fw.Stop()
 	}()
 	var resumeRV string
@@ -132,7 +132,7 @@ func TestReflector_listAndWatch(t *testing.T) {
 			fw = <-createdFakes
 		}
 		sendingRV := strconv.FormatUint(uint64(i+2), 10)
-		fw.Add(&api.Pod{TypeMeta: api.TypeMeta{ID: id, ResourceVersion: sendingRV}})
+		fw.Add(&api.Pod{TypeMeta: api.TypeMeta{Name: id, ResourceVersion: sendingRV}})
 		if sendingRV == "3" {
 			// Inject a failure.
 			fw.Stop()
@@ -143,7 +143,7 @@ func TestReflector_listAndWatch(t *testing.T) {
 	// Verify we received the right ids with the right resource versions.
 	for i, id := range ids {
 		pod := s.Pop().(*api.Pod)
-		if e, a := id, pod.ID; e != a {
+		if e, a := id, pod.Name; e != a {
 			t.Errorf("%v: Expected %v, got %v", i, e, a)
 		}
 		if e, a := strconv.FormatUint(uint64(i+2), 10), pod.ResourceVersion; e != a {
@@ -158,7 +158,7 @@ func TestReflector_listAndWatch(t *testing.T) {
 
 func TestReflector_listAndWatchWithErrors(t *testing.T) {
 	mkPod := func(id string, rv string) *api.Pod {
-		return &api.Pod{TypeMeta: api.TypeMeta{ID: id, ResourceVersion: rv}}
+		return &api.Pod{TypeMeta: api.TypeMeta{Name: id, ResourceVersion: rv}}
 	}
 	mkList := func(rv string, pods ...*api.Pod) *api.PodList {
 		list := &api.PodList{TypeMeta: api.TypeMeta{ResourceVersion: rv}}
@@ -208,11 +208,11 @@ func TestReflector_listAndWatchWithErrors(t *testing.T) {
 			checkMap := map[string]string{}
 			for _, item := range current {
 				pod := item.(*api.Pod)
-				checkMap[pod.ID] = pod.ResourceVersion
+				checkMap[pod.Name] = pod.ResourceVersion
 			}
 			for _, pod := range item.list.Items {
-				if e, a := pod.ResourceVersion, checkMap[pod.ID]; e != a {
-					t.Errorf("%v: expected %v, got %v for pod %v", line, e, a, pod.ID)
+				if e, a := pod.ResourceVersion, checkMap[pod.Name]; e != a {
+					t.Errorf("%v: expected %v, got %v for pod %v", line, e, a, pod.Name)
 				}
 			}
 			if e, a := len(item.list.Items), len(checkMap); e != a {

pkg/client/client.go

@@ -136,7 +136,7 @@ func (c *Client) UpdatePod(ctx api.Context, pod *api.Pod) (result *api.Pod, err
 		err = fmt.Errorf("invalid update object, missing resource version: %v", pod)
 		return
 	}
-	err = c.Put().Namespace(api.Namespace(ctx)).Path("pods").Path(pod.ID).Body(pod).Do().Into(result)
+	err = c.Put().Namespace(api.Namespace(ctx)).Path("pods").Path(pod.Name).Body(pod).Do().Into(result)
 	return
 }
 
@@ -168,7 +168,7 @@ func (c *Client) UpdateReplicationController(ctx api.Context, controller *api.Re
 		err = fmt.Errorf("invalid update object, missing resource version: %v", controller)
 		return
 	}
-	err = c.Put().Namespace(api.Namespace(ctx)).Path("replicationControllers").Path(controller.ID).Body(controller).Do().Into(result)
+	err = c.Put().Namespace(api.Namespace(ctx)).Path("replicationControllers").Path(controller.Name).Body(controller).Do().Into(result)
 	return
 }
 
@@ -217,7 +217,7 @@ func (c *Client) UpdateService(ctx api.Context, svc *api.Service) (result *api.S
 		err = fmt.Errorf("invalid update object, missing resource version: %v", svc)
 		return
 	}
-	err = c.Put().Namespace(api.Namespace(ctx)).Path("services").Path(svc.ID).Body(svc).Do().Into(result)
+	err = c.Put().Namespace(api.Namespace(ctx)).Path("services").Path(svc.Name).Body(svc).Do().Into(result)
 	return
 }
 
@@ -280,7 +280,7 @@ func (c *Client) UpdateEndpoints(ctx api.Context, endpoints *api.Endpoints) (*ap
 	err := c.Put().
 		Namespace(api.Namespace(ctx)).
 		Path("endpoints").
-		Path(endpoints.ID).
+		Path(endpoints.Name).
 		Body(endpoints).
 		Do().
 		Into(result)

pkg/client/client_test.go

@@ -266,7 +266,7 @@ func TestCreatePod(t *testing.T) {
 
 func TestUpdatePod(t *testing.T) {
 	requestPod := &api.Pod{
-		TypeMeta: api.TypeMeta{ID: "foo", ResourceVersion: "1"},
+		TypeMeta: api.TypeMeta{Name: "foo", ResourceVersion: "1"},
 		CurrentState: api.PodState{
 			Status: "Foobar",
 		},
@@ -290,7 +290,7 @@ func TestListControllers(t *testing.T) {
 			Body: &api.ReplicationControllerList{
 				Items: []api.ReplicationController{
 					{
-						TypeMeta: api.TypeMeta{ID: "foo"},
+						TypeMeta: api.TypeMeta{Name: "foo"},
 						DesiredState: api.ReplicationControllerState{
 							Replicas: 2,
 						},
@@ -314,7 +314,7 @@ func TestGetController(t *testing.T) {
 		Response: Response{
 			StatusCode: 200,
 			Body: &api.ReplicationController{
-				TypeMeta: api.TypeMeta{ID: "foo"},
+				TypeMeta: api.TypeMeta{Name: "foo"},
 				DesiredState: api.ReplicationControllerState{
 					Replicas: 2,
 				},
@@ -331,14 +331,14 @@ func TestGetController(t *testing.T) {
 
 func TestUpdateController(t *testing.T) {
 	requestController := &api.ReplicationController{
-		TypeMeta: api.TypeMeta{ID: "foo", ResourceVersion: "1"},
+		TypeMeta: api.TypeMeta{Name: "foo", ResourceVersion: "1"},
 	}
 	c := &testClient{
 		Request: testRequest{Method: "PUT", Path: "/replicationControllers/foo"},
 		Response: Response{
 			StatusCode: 200,
 			Body: &api.ReplicationController{
-				TypeMeta: api.TypeMeta{ID: "foo"},
+				TypeMeta: api.TypeMeta{Name: "foo"},
 				DesiredState: api.ReplicationControllerState{
 					Replicas: 2,
 				},
@@ -364,14 +364,14 @@ func TestDeleteController(t *testing.T) {
 
 func TestCreateController(t *testing.T) {
 	requestController := &api.ReplicationController{
-		TypeMeta: api.TypeMeta{ID: "foo"},
+		TypeMeta: api.TypeMeta{Name: "foo"},
 	}
 	c := &testClient{
 		Request: testRequest{Method: "POST", Path: "/replicationControllers", Body: requestController},
 		Response: Response{
 			StatusCode: 200,
 			Body: &api.ReplicationController{
-				TypeMeta: api.TypeMeta{ID: "foo"},
+				TypeMeta: api.TypeMeta{Name: "foo"},
 				DesiredState: api.ReplicationControllerState{
 					Replicas: 2,
 				},
@@ -402,7 +402,7 @@ func TestListServices(t *testing.T) {
 			Body: &api.ServiceList{
 				Items: []api.Service{
 					{
-						TypeMeta: api.TypeMeta{ID: "name"},
+						TypeMeta: api.TypeMeta{Name: "name"},
 						Labels: map[string]string{
 							"foo":  "bar",
 							"name": "baz",
@@ -426,7 +426,7 @@ func TestListServicesLabels(t *testing.T) {
 			Body: &api.ServiceList{
 				Items: []api.Service{
 					{
-						TypeMeta: api.TypeMeta{ID: "name"},
+						TypeMeta: api.TypeMeta{Name: "name"},
 						Labels: map[string]string{
 							"foo":  "bar",
 							"name": "baz",
@@ -449,7 +449,7 @@ func TestListServicesLabels(t *testing.T) {
 func TestGetService(t *testing.T) {
 	c := &testClient{
 		Request:  testRequest{Method: "GET", Path: "/services/1"},
-		Response: Response{StatusCode: 200, Body: &api.Service{TypeMeta: api.TypeMeta{ID: "service-1"}}},
+		Response: Response{StatusCode: 200, Body: &api.Service{TypeMeta: api.TypeMeta{Name: "service-1"}}},
 	}
 	response, err := c.Setup().GetService(api.NewDefaultContext(), "1")
 	c.Validate(t, response, err)
@@ -457,15 +457,15 @@ func TestGetService(t *testing.T) {
 
 func TestCreateService(t *testing.T) {
 	c := &testClient{
-		Request:  testRequest{Method: "POST", Path: "/services", Body: &api.Service{TypeMeta: api.TypeMeta{ID: "service-1"}}},
-		Response: Response{StatusCode: 200, Body: &api.Service{TypeMeta: api.TypeMeta{ID: "service-1"}}},
+		Request:  testRequest{Method: "POST", Path: "/services", Body: &api.Service{TypeMeta: api.TypeMeta{Name: "service-1"}}},
+		Response: Response{StatusCode: 200, Body: &api.Service{TypeMeta: api.TypeMeta{Name: "service-1"}}},
 	}
-	response, err := c.Setup().CreateService(api.NewDefaultContext(), &api.Service{TypeMeta: api.TypeMeta{ID: "service-1"}})
+	response, err := c.Setup().CreateService(api.NewDefaultContext(), &api.Service{TypeMeta: api.TypeMeta{Name: "service-1"}})
 	c.Validate(t, response, err)
 }
 
 func TestUpdateService(t *testing.T) {
-	svc := &api.Service{TypeMeta: api.TypeMeta{ID: "service-1", ResourceVersion: "1"}}
+	svc := &api.Service{TypeMeta: api.TypeMeta{Name: "service-1", ResourceVersion: "1"}}
 	c := &testClient{
 		Request:  testRequest{Method: "PUT", Path: "/services/service-1", Body: svc},
 		Response: Response{StatusCode: 200, Body: svc},
@@ -490,7 +490,7 @@ func TestListEndpooints(t *testing.T) {
 			Body: &api.EndpointsList{
 				Items: []api.Endpoints{
 					{
-						TypeMeta:  api.TypeMeta{ID: "endpoint-1"},
+						TypeMeta:  api.TypeMeta{Name: "endpoint-1"},
 						Endpoints: []string{"10.245.1.2:8080", "10.245.1.3:8080"},
 					},
 				},
@@ -504,7 +504,7 @@ func TestListEndpooints(t *testing.T) {
 func TestGetEndpoints(t *testing.T) {
 	c := &testClient{
 		Request:  testRequest{Method: "GET", Path: "/endpoints/endpoint-1"},
-		Response: Response{StatusCode: 200, Body: &api.Endpoints{TypeMeta: api.TypeMeta{ID: "endpoint-1"}}},
+		Response: Response{StatusCode: 200, Body: &api.Endpoints{TypeMeta: api.TypeMeta{Name: "endpoint-1"}}},
 	}
 	response, err := c.Setup().GetEndpoints(api.NewDefaultContext(), "endpoint-1")
 	c.Validate(t, response, err)
@@ -540,7 +540,7 @@ func TestGetServerVersion(t *testing.T) {
 func TestListMinions(t *testing.T) {
 	c := &testClient{
 		Request:  testRequest{Method: "GET", Path: "/minions"},
-		Response: Response{StatusCode: 200, Body: &api.MinionList{TypeMeta: api.TypeMeta{ID: "minion-1"}}},
+		Response: Response{StatusCode: 200, Body: &api.MinionList{TypeMeta: api.TypeMeta{Name: "minion-1"}}},
 	}
 	response, err := c.Setup().ListMinions()
 	c.Validate(t, response, err)
@@ -549,7 +549,7 @@ func TestListMinions(t *testing.T) {
 func TestCreateMinion(t *testing.T) {
 	requestMinion := &api.Minion{
 		TypeMeta: api.TypeMeta{
-			ID: "minion-1",
+			Name: "minion-1",
 		},
 		HostIP: "123.321.456.654",
 		NodeResources: api.NodeResources{

pkg/client/fake.go

@@ -64,7 +64,7 @@ func (c *Fake) CreatePod(ctx api.Context, pod *api.Pod) (*api.Pod, error) {
 }
 
 func (c *Fake) UpdatePod(ctx api.Context, pod *api.Pod) (*api.Pod, error) {
-	c.Actions = append(c.Actions, FakeAction{Action: "update-pod", Value: pod.ID})
+	c.Actions = append(c.Actions, FakeAction{Action: "update-pod", Value: pod.Name})
 	return &api.Pod{}, nil
 }
 
@@ -166,7 +166,7 @@ func (c *Fake) DeleteMinion(id string) error {
 
 // CreateEvent makes a new event. Returns the copy of the event the server returns, or an error.
 func (c *Fake) CreateEvent(event *api.Event) (*api.Event, error) {
-	c.Actions = append(c.Actions, FakeAction{Action: "get-event", Value: event.ID})
+	c.Actions = append(c.Actions, FakeAction{Action: "get-event", Value: event.Name})
 	return &api.Event{}, nil
 }
 

pkg/client/record/event_test.go

@@ -56,7 +56,7 @@ func TestEventf(t *testing.T) {
 			obj: &api.Pod{
 				TypeMeta: api.TypeMeta{
 					SelfLink: "/api/v1beta1/pods/foo",
-					ID:       "foo",
+					Name:     "foo",
 				},
 			},
 			fieldPath:  "desiredState.manifest.containers[2]",

pkg/client/request_test.go

@@ -72,7 +72,7 @@ func TestDoRequestNewWay(t *testing.T) {
 }
 
 func TestDoRequestNewWayReader(t *testing.T) {
-	reqObj := &api.Pod{TypeMeta: api.TypeMeta{ID: "foo"}}
+	reqObj := &api.Pod{TypeMeta: api.TypeMeta{Name: "foo"}}
 	reqBodyExpected, _ := v1beta1.Codec.Encode(reqObj)
 	expectedObj := &api.Service{Port: 12345}
 	expectedBody, _ := v1beta1.Codec.Encode(expectedObj)
@@ -108,7 +108,7 @@ func TestDoRequestNewWayReader(t *testing.T) {
 }
 
 func TestDoRequestNewWayObj(t *testing.T) {
-	reqObj := &api.Pod{TypeMeta: api.TypeMeta{ID: "foo"}}
+	reqObj := &api.Pod{TypeMeta: api.TypeMeta{Name: "foo"}}
 	reqBodyExpected, _ := v1beta2.Codec.Encode(reqObj)
 	expectedObj := &api.Service{Port: 12345}
 	expectedBody, _ := v1beta2.Codec.Encode(expectedObj)
@@ -143,7 +143,7 @@ func TestDoRequestNewWayObj(t *testing.T) {
 }
 
 func TestDoRequestNewWayFile(t *testing.T) {
-	reqObj := &api.Pod{TypeMeta: api.TypeMeta{ID: "foo"}}
+	reqObj := &api.Pod{TypeMeta: api.TypeMeta{Name: "foo"}}
 	reqBodyExpected, err := v1beta1.Codec.Encode(reqObj)
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)
@@ -380,9 +380,9 @@ func TestWatch(t *testing.T) {
 		t   watch.EventType
 		obj runtime.Object
 	}{
-		{watch.Added, &api.Pod{TypeMeta: api.TypeMeta{ID: "first"}}},
-		{watch.Modified, &api.Pod{TypeMeta: api.TypeMeta{ID: "second"}}},
-		{watch.Deleted, &api.Pod{TypeMeta: api.TypeMeta{ID: "last"}}},
+		{watch.Added, &api.Pod{TypeMeta: api.TypeMeta{Name: "first"}}},
+		{watch.Modified, &api.Pod{TypeMeta: api.TypeMeta{Name: "second"}}},
+		{watch.Deleted, &api.Pod{TypeMeta: api.TypeMeta{Name: "last"}}},
 	}
 
 	auth := &Config{Username: "user", Password: "pass"}

pkg/cloudprovider/controller/minioncontroller.go

@@ -70,19 +70,19 @@ func (s *MinionController) Sync() error {
 	}
 	minionMap := make(map[string]*api.Minion)
 	for _, minion := range minions.Items {
-		minionMap[minion.ID] = &minion
+		minionMap[minion.Name] = &minion
 	}
 
 	// Create or delete minions from registry.
-	for _, match := range matches.Items {
-		if _, ok := minionMap[match.ID]; !ok {
-			glog.Infof("Create minion in registry: %s", match.ID)
-			err = s.registry.CreateMinion(nil, &match)
+	for _, minion := range matches.Items {
+		if _, ok := minionMap[minion.Name]; !ok {
+			glog.Infof("Create minion in registry: %s", minion.Name)
+			err = s.registry.CreateMinion(nil, &minion)
 			if err != nil {
 				return err
 			}
 		}
-		delete(minionMap, match.ID)
+		delete(minionMap, minion.Name)
 	}
 
 	for minionID := range minionMap {
@@ -109,7 +109,7 @@ func (s *MinionController) cloudMinions() (*api.MinionList, error) {
 		Items: make([]api.Minion, len(matches)),
 	}
 	for i := range matches {
-		result.Items[i].ID = matches[i]
+		result.Items[i].Name = matches[i]
 		resources, err := instances.GetNodeResources(matches[i])
 		if err != nil {
 			return nil, err

pkg/cloudprovider/controller/minioncontroller_test.go

@@ -45,8 +45,8 @@ func NewTestEtcdRegistry(client tools.EtcdClient) *etcdregistry.Registry {
 func TestSyncCreateMinion(t *testing.T) {
 	ctx := api.NewContext()
 	fakeClient := tools.NewFakeEtcdClient(t)
-	m1 := runtime.EncodeOrDie(latest.Codec, &api.Minion{TypeMeta: api.TypeMeta{ID: "m1"}})
-	m2 := runtime.EncodeOrDie(latest.Codec, &api.Minion{TypeMeta: api.TypeMeta{ID: "m2"}})
+	m1 := runtime.EncodeOrDie(latest.Codec, &api.Minion{TypeMeta: api.TypeMeta{Name: "m1"}})
+	m2 := runtime.EncodeOrDie(latest.Codec, &api.Minion{TypeMeta: api.TypeMeta{Name: "m2"}})
 	fakeClient.Set("/registry/minions/m1", m1, 0)
 	fakeClient.Set("/registry/minions/m2", m2, 0)
 	fakeClient.ExpectNotFoundGet("/registry/minions/m3")
@@ -88,9 +88,9 @@ func TestSyncCreateMinion(t *testing.T) {
 func TestSyncDeleteMinion(t *testing.T) {
 	ctx := api.NewContext()
 	fakeClient := tools.NewFakeEtcdClient(t)
-	m1 := runtime.EncodeOrDie(latest.Codec, &api.Minion{TypeMeta: api.TypeMeta{ID: "m1"}})
-	m2 := runtime.EncodeOrDie(latest.Codec, &api.Minion{TypeMeta: api.TypeMeta{ID: "m2"}})
-	m3 := runtime.EncodeOrDie(latest.Codec, &api.Minion{TypeMeta: api.TypeMeta{ID: "m3"}})
+	m1 := runtime.EncodeOrDie(latest.Codec, &api.Minion{TypeMeta: api.TypeMeta{Name: "m1"}})
+	m2 := runtime.EncodeOrDie(latest.Codec, &api.Minion{TypeMeta: api.TypeMeta{Name: "m2"}})
+	m3 := runtime.EncodeOrDie(latest.Codec, &api.Minion{TypeMeta: api.TypeMeta{Name: "m3"}})
 	fakeClient.Set("/registry/minions/m1", m1, 0)
 	fakeClient.Set("/registry/minions/m2", m2, 0)
 	fakeClient.Set("/registry/minions/m3", m3, 0)

pkg/controller/replication_controller.go

@@ -56,7 +56,7 @@ func (r RealPodControl) createReplica(ctx api.Context, controllerSpec api.Replic
 	labels := controllerSpec.DesiredState.PodTemplate.Labels
 	// TODO: don't fail to set this label just because the map isn't created.
 	if labels != nil {
-		labels["replicationController"] = controllerSpec.ID
+		labels["replicationController"] = controllerSpec.Name
 	}
 	pod := &api.Pod{
 		DesiredState: controllerSpec.DesiredState.PodTemplate.DesiredState,
@@ -127,7 +127,7 @@ func (rm *ReplicationManager) watchControllers(resourceVersion *string) {
 			*resourceVersion = rc.ResourceVersion
 			// Sync even if this is a deletion event, to ensure that we leave
 			// it in the desired state.
-			glog.V(4).Infof("About to sync from watch: %v", rc.ID)
+			glog.V(4).Infof("About to sync from watch: %v", rc.Name)
 			rm.syncHandler(*rc)
 		}
 	}
@@ -171,7 +171,7 @@ func (rm *ReplicationManager) syncReplicationController(controllerSpec api.Repli
 		for i := 0; i < diff; i++ {
 			go func(ix int) {
 				defer wait.Done()
-				rm.podControl.deletePod(ctx, filteredList[ix].ID)
+				rm.podControl.deletePod(ctx, filteredList[ix].Name)
 			}(i)
 		}
 		wait.Wait()
@@ -195,7 +195,7 @@ func (rm *ReplicationManager) synchronize() {
 	for ix := range controllerSpecs {
 		go func(ix int) {
 			defer wg.Done()
-			glog.V(4).Infof("periodic sync of %v", controllerSpecs[ix].ID)
+			glog.V(4).Infof("periodic sync of %v", controllerSpecs[ix].Name)
 			err := rm.syncHandler(controllerSpecs[ix])
 			if err != nil {
 				glog.Errorf("Error synchronizing: %#v", err)

pkg/controller/replication_controller_test.go

@@ -90,7 +90,7 @@ func newPodList(count int) *api.PodList {
 	for i := 0; i < count; i++ {
 		pods = append(pods, api.Pod{
 			TypeMeta: api.TypeMeta{
-				ID: fmt.Sprintf("pod%d", i),
+				Name: fmt.Sprintf("pod%d", i),
 			},
 		})
 	}
@@ -345,7 +345,7 @@ func TestWatchControllers(t *testing.T) {
 	go manager.watchControllers(&resourceVersion)
 
 	// Test normal case
-	testControllerSpec.ID = "foo"
+	testControllerSpec.Name = "foo"
 	client.w.Add(&testControllerSpec)
 
 	select {

pkg/kubecfg/kubecfg.go

@@ -153,7 +153,7 @@ func Update(ctx api.Context, name string, client client.Interface, updatePeriod
 	for _, pod := range podList.Items {
 		// We delete the pod here, the controller will recreate it.  This will result in pulling
 		// a new Docker image.  This isn't a full "update" but it's what we support for now.
-		err = client.DeletePod(ctx, pod.ID)
+		err = client.DeletePod(ctx, pod.Name)
 		if err != nil {
 			return err
 		}
@@ -246,7 +246,7 @@ func RunController(ctx api.Context, image, name string, replicas int, client cli
 	}
 	controller := &api.ReplicationController{
 		TypeMeta: api.TypeMeta{
-			ID: name,
+			Name: name,
 		},
 		DesiredState: api.ReplicationControllerState{
 			Replicas: replicas,
@@ -299,7 +299,7 @@ func RunController(ctx api.Context, image, name string, replicas int, client cli
 
 func createService(ctx api.Context, name string, port int, client client.Interface) (*api.Service, error) {
 	svc := &api.Service{
-		TypeMeta: api.TypeMeta{ID: name},
+		TypeMeta: api.TypeMeta{Name: name},
 		Port:     port,
 		Labels: map[string]string{
 			"simpleService": name,

pkg/kubecfg/kubecfg_test.go

@@ -38,8 +38,8 @@ func TestUpdateWithPods(t *testing.T) {
 	fakeClient := client.Fake{
 		Pods: api.PodList{
 			Items: []api.Pod{
-				{TypeMeta: api.TypeMeta{ID: "pod-1"}},
-				{TypeMeta: api.TypeMeta{ID: "pod-2"}},
+				{TypeMeta: api.TypeMeta{Name: "pod-1"}},
+				{TypeMeta: api.TypeMeta{Name: "pod-2"}},
 			},
 		},
 	}
@@ -69,8 +69,8 @@ func TestUpdateWithNewImage(t *testing.T) {
 	fakeClient := client.Fake{
 		Pods: api.PodList{
 			Items: []api.Pod{
-				{TypeMeta: api.TypeMeta{ID: "pod-1"}},
-				{TypeMeta: api.TypeMeta{ID: "pod-2"}},
+				{TypeMeta: api.TypeMeta{Name: "pod-1"}},
+				{TypeMeta: api.TypeMeta{Name: "pod-2"}},
 			},
 		},
 		Ctrl: api.ReplicationController{
@@ -114,7 +114,7 @@ func TestRunController(t *testing.T) {
 		t.Errorf("Unexpected actions: %#v", fakeClient.Actions)
 	}
 	controller := fakeClient.Actions[0].Value.(*api.ReplicationController)
-	if controller.ID != name ||
+	if controller.Name != name ||
 		controller.DesiredState.Replicas != replicas ||
 		controller.DesiredState.PodTemplate.DesiredState.Manifest.Containers[0].Image != image {
 		t.Errorf("Unexpected controller: %#v", controller)
@@ -135,7 +135,7 @@ func TestRunControllerWithWrongArgs(t *testing.T) {
 		t.Errorf("Unexpected actions: %#v", fakeClient.Actions)
 	}
 	controller := fakeClient.Actions[0].Value.(*api.ReplicationController)
-	if controller.ID != name ||
+	if controller.Name != name ||
 		controller.DesiredState.Replicas != replicas ||
 		controller.DesiredState.PodTemplate.DesiredState.Manifest.Containers[0].Image != image {
 		t.Errorf("Unexpected controller: %#v", controller)
@@ -154,7 +154,7 @@ func TestRunControllerWithService(t *testing.T) {
 		t.Errorf("Unexpected actions: %#v", fakeClient.Actions)
 	}
 	controller := fakeClient.Actions[0].Value.(*api.ReplicationController)
-	if controller.ID != name ||
+	if controller.Name != name ||
 		controller.DesiredState.Replicas != replicas ||
 		controller.DesiredState.PodTemplate.DesiredState.Manifest.Containers[0].Image != image {
 		t.Errorf("Unexpected controller: %#v", controller)

pkg/kubecfg/parse_test.go

@@ -69,7 +69,7 @@ var testParser = NewParser(map[string]runtime.Object{
 
 func TestParsePod(t *testing.T) {
 	DoParseTest(t, "pods", &api.Pod{
-		TypeMeta: api.TypeMeta{APIVersion: "v1beta1", ID: "test pod", Kind: "Pod"},
+		TypeMeta: api.TypeMeta{APIVersion: "v1beta1", Name: "test pod", Kind: "Pod"},
 		DesiredState: api.PodState{
 			Manifest: api.ContainerManifest{
 				ID: "My manifest",
@@ -86,7 +86,7 @@ func TestParsePod(t *testing.T) {
 
 func TestParseService(t *testing.T) {
 	DoParseTest(t, "services", &api.Service{
-		TypeMeta: api.TypeMeta{APIVersion: "v1beta1", ID: "my service", Kind: "Service"},
+		TypeMeta: api.TypeMeta{APIVersion: "v1beta1", Name: "my service", Kind: "Service"},
 		Port:     8080,
 		Labels: map[string]string{
 			"area": "staging",
@@ -99,7 +99,7 @@ func TestParseService(t *testing.T) {
 
 func TestParseController(t *testing.T) {
 	DoParseTest(t, "replicationControllers", &api.ReplicationController{
-		TypeMeta: api.TypeMeta{APIVersion: "v1beta1", ID: "my controller", Kind: "ReplicationController"},
+		TypeMeta: api.TypeMeta{APIVersion: "v1beta1", Name: "my controller", Kind: "ReplicationController"},
 		DesiredState: api.ReplicationControllerState{
 			Replicas: 9001,
 			PodTemplate: api.PodTemplate{
@@ -134,7 +134,7 @@ func TestParseCustomType(t *testing.T) {
 		"custom": &TestParseType{},
 	})
 	DoParseTest(t, "custom", &TestParseType{
-		TypeMeta: api.TypeMeta{APIVersion: "", ID: "my custom object", Kind: "TestParseType"},
+		TypeMeta: api.TypeMeta{APIVersion: "", Name: "my custom object", Kind: "TestParseType"},
 		Data:     "test data",
 	}, v1beta1.Codec, parser)
 }

pkg/kubecfg/resource_printer.go

@@ -138,9 +138,9 @@ func (h *HumanReadablePrinter) validatePrintHandlerFunc(printFunc reflect.Value)
 	return nil
 }
 
-var podColumns = []string{"ID", "Image(s)", "Host", "Labels", "Status"}
-var replicationControllerColumns = []string{"ID", "Image(s)", "Selector", "Replicas"}
-var serviceColumns = []string{"ID", "Labels", "Selector", "IP", "Port"}
+var podColumns = []string{"Name", "Image(s)", "Host", "Labels", "Status"}
+var replicationControllerColumns = []string{"Name", "Image(s)", "Selector", "Replicas"}
+var serviceColumns = []string{"Name", "Labels", "Selector", "IP", "Port"}
 var minionColumns = []string{"Minion identifier"}
 var statusColumns = []string{"Status"}
 var eventColumns = []string{"Name", "Kind", "Status", "Reason", "Message"}
@@ -194,7 +194,7 @@ func podHostString(host, ip string) string {
 
 func printPod(pod *api.Pod, w io.Writer) error {
 	_, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n",
-		pod.ID, makeImageList(pod.DesiredState.Manifest),
+		pod.Name, makeImageList(pod.DesiredState.Manifest),
 		podHostString(pod.CurrentState.Host, pod.CurrentState.HostIP),
 		labels.Set(pod.Labels), pod.CurrentState.Status)
 	return err
@@ -209,16 +209,16 @@ func printPodList(podList *api.PodList, w io.Writer) error {
 	return nil
 }
 
-func printReplicationController(ctrl *api.ReplicationController, w io.Writer) error {
+func printReplicationController(controller *api.ReplicationController, w io.Writer) error {
 	_, err := fmt.Fprintf(w, "%s\t%s\t%s\t%d\n",
-		ctrl.ID, makeImageList(ctrl.DesiredState.PodTemplate.DesiredState.Manifest),
-		labels.Set(ctrl.DesiredState.ReplicaSelector), ctrl.DesiredState.Replicas)
+		controller.Name, makeImageList(controller.DesiredState.PodTemplate.DesiredState.Manifest),
+		labels.Set(controller.DesiredState.ReplicaSelector), controller.DesiredState.Replicas)
 	return err
 }
 
 func printReplicationControllerList(list *api.ReplicationControllerList, w io.Writer) error {
-	for _, ctrl := range list.Items {
-		if err := printReplicationController(&ctrl, w); err != nil {
+	for _, controller := range list.Items {
+		if err := printReplicationController(&controller, w); err != nil {
 			return err
 		}
 	}
@@ -226,7 +226,7 @@ func printReplicationControllerList(list *api.ReplicationControllerList, w io.Wr
 }
 
 func printService(svc *api.Service, w io.Writer) error {
-	_, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%d\n", svc.ID, labels.Set(svc.Labels),
+	_, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%d\n", svc.Name, labels.Set(svc.Labels),
 		labels.Set(svc.Selector), svc.PortalIP, svc.Port)
 	return err
 }
@@ -241,7 +241,7 @@ func printServiceList(list *api.ServiceList, w io.Writer) error {
 }
 
 func printMinion(minion *api.Minion, w io.Writer) error {
-	_, err := fmt.Fprintf(w, "%s\n", minion.ID)
+	_, err := fmt.Fprintf(w, "%s\n", minion.Name)
 	return err
 }
 

pkg/kubecfg/resource_printer_test.go

@@ -68,7 +68,7 @@ func TestYAMLPrinterPrint(t *testing.T) {
 	}
 
 	obj := &api.Pod{
-		TypeMeta: api.TypeMeta{ID: "foo"},
+		TypeMeta: api.TypeMeta{Name: "foo"},
 	}
 	buf.Reset()
 	printer.PrintObj(obj, buf)
@@ -92,7 +92,7 @@ func TestIdentityPrinter(t *testing.T) {
 	}
 
 	obj := &api.Pod{
-		TypeMeta: api.TypeMeta{ID: "foo"},
+		TypeMeta: api.TypeMeta{Name: "foo"},
 	}
 	buff.Reset()
 	printer.PrintObj(obj, buff)

pkg/kubectl/cmd/delete.go

@@ -50,7 +50,7 @@ Examples:
 		Run: func(cmd *cobra.Command, args []string) {
 			// If command line args are passed in, use those preferentially.
 			if len(args) > 0 && len(args) != 2 {
-				usageError(cmd, "If passing in command line parameters, must be resource and id")
+				usageError(cmd, "If passing in command line parameters, must be resource and name")
 			}
 
 			var data []byte

pkg/kubectl/describe.go

@@ -61,7 +61,7 @@ func describePod(w io.Writer, c client.Interface, id string) (string, error) {
 	}
 
 	return tabbedString(func(out *tabwriter.Writer) error {
-		fmt.Fprintf(out, "ID:\t%s\n", pod.ID)
+		fmt.Fprintf(out, "Name:\t%s\n", pod.Name)
 		fmt.Fprintf(out, "Image(s):\t%s\n", makeImageList(pod.DesiredState.Manifest))
 		fmt.Fprintf(out, "Host:\t%s\n", pod.CurrentState.Host+"/"+pod.CurrentState.HostIP)
 		fmt.Fprintf(out, "Labels:\t%s\n", formatLabels(pod.Labels))
@@ -72,50 +72,50 @@ func describePod(w io.Writer, c client.Interface, id string) (string, error) {
 }
 
 func describeReplicationController(w io.Writer, c client.Interface, id string) (string, error) {
-	rc, err := c.GetReplicationController(api.NewDefaultContext(), id)
+	controller, err := c.GetReplicationController(api.NewDefaultContext(), id)
 	if err != nil {
 		return "", err
 	}
 
-	running, waiting, terminated, err := getPodStatusForReplicationController(c, rc)
+	running, waiting, terminated, err := getPodStatusForReplicationController(c, controller)
 	if err != nil {
 		return "", err
 	}
 
 	return tabbedString(func(out *tabwriter.Writer) error {
-		fmt.Fprintf(out, "ID:\t%s\n", rc.ID)
-		fmt.Fprintf(out, "Image(s):\t%s\n", makeImageList(rc.DesiredState.PodTemplate.DesiredState.Manifest))
-		fmt.Fprintf(out, "Selector:\t%s\n", formatLabels(rc.DesiredState.ReplicaSelector))
-		fmt.Fprintf(out, "Labels:\t%s\n", formatLabels(rc.Labels))
-		fmt.Fprintf(out, "Replicas:\t%d current / %d desired\n", rc.CurrentState.Replicas, rc.DesiredState.Replicas)
+		fmt.Fprintf(out, "Name:\t%s\n", controller.Name)
+		fmt.Fprintf(out, "Image(s):\t%s\n", makeImageList(controller.DesiredState.PodTemplate.DesiredState.Manifest))
+		fmt.Fprintf(out, "Selector:\t%s\n", formatLabels(controller.DesiredState.ReplicaSelector))
+		fmt.Fprintf(out, "Labels:\t%s\n", formatLabels(controller.Labels))
+		fmt.Fprintf(out, "Replicas:\t%d current / %d desired\n", controller.CurrentState.Replicas, controller.DesiredState.Replicas)
 		fmt.Fprintf(out, "Pods Status:\t%d Running / %d Waiting / %d Terminated\n", running, waiting, terminated)
 		return nil
 	})
 }
 
 func describeService(w io.Writer, c client.Interface, id string) (string, error) {
-	s, err := c.GetService(api.NewDefaultContext(), id)
+	service, err := c.GetService(api.NewDefaultContext(), id)
 	if err != nil {
 		return "", err
 	}
 
 	return tabbedString(func(out *tabwriter.Writer) error {
-		fmt.Fprintf(out, "ID:\t%s\n", s.ID)
-		fmt.Fprintf(out, "Labels:\t%s\n", formatLabels(s.Labels))
-		fmt.Fprintf(out, "Selector:\t%s\n", formatLabels(s.Selector))
-		fmt.Fprintf(out, "Port:\t%d\n", s.Port)
+		fmt.Fprintf(out, "Name:\t%s\n", service.Name)
+		fmt.Fprintf(out, "Labels:\t%s\n", formatLabels(service.Labels))
+		fmt.Fprintf(out, "Selector:\t%s\n", formatLabels(service.Selector))
+		fmt.Fprintf(out, "Port:\t%d\n", service.Port)
 		return nil
 	})
 }
 
 func describeMinion(w io.Writer, c client.Interface, id string) (string, error) {
-	m, err := getMinion(c, id)
+	minion, err := getMinion(c, id)
 	if err != nil {
 		return "", err
 	}
 
 	return tabbedString(func(out *tabwriter.Writer) error {
-		fmt.Fprintf(out, "ID:\t%s\n", m.ID)
+		fmt.Fprintf(out, "Name:\t%s\n", minion.Name)
 		return nil
 	})
 }
@@ -127,9 +127,9 @@ func getMinion(c client.Interface, id string) (*api.Minion, error) {
 		glog.Fatalf("Error getting minion info: %v\n", err)
 	}
 
-	for _, m := range minionList.Items {
-		if id == m.TypeMeta.ID {
-			return &m, nil
+	for _, minion := range minionList.Items {
+		if id == minion.Name {
+			return &minion, nil
 		}
 	}
 	return nil, fmt.Errorf("Minion %s not found", id)
@@ -148,17 +148,17 @@ func getReplicationControllersForLabels(c client.Interface, labelsToMatch labels
 
 	// Find the ones that match labelsToMatch.
 	var matchingRCs []api.ReplicationController
-	for _, rc := range rcs.Items {
-		selector := labels.SelectorFromSet(rc.DesiredState.ReplicaSelector)
+	for _, controller := range rcs.Items {
+		selector := labels.SelectorFromSet(controller.DesiredState.ReplicaSelector)
 		if selector.Matches(labelsToMatch) {
-			matchingRCs = append(matchingRCs, rc)
+			matchingRCs = append(matchingRCs, controller)
 		}
 	}
 
 	// Format the matching RC's into strings.
 	var rcStrings []string
-	for _, rc := range matchingRCs {
-		rcStrings = append(rcStrings, fmt.Sprintf("%s (%d/%d replicas created)", rc.ID, rc.CurrentState.Replicas, rc.DesiredState.Replicas))
+	for _, controller := range matchingRCs {
+		rcStrings = append(rcStrings, fmt.Sprintf("%s (%d/%d replicas created)", controller.Name, controller.CurrentState.Replicas, controller.DesiredState.Replicas))
 	}
 
 	list := strings.Join(rcStrings, ", ")
@@ -168,8 +168,8 @@ func getReplicationControllersForLabels(c client.Interface, labelsToMatch labels
 	return list
 }
 
-func getPodStatusForReplicationController(kubeClient client.Interface, rc *api.ReplicationController) (running, waiting, terminated int, err error) {
-	rcPods, err := kubeClient.ListPods(api.NewDefaultContext(), labels.SelectorFromSet(rc.DesiredState.ReplicaSelector))
+func getPodStatusForReplicationController(kubeClient client.Interface, controller *api.ReplicationController) (running, waiting, terminated int, err error) {
+	rcPods, err := kubeClient.ListPods(api.NewDefaultContext(), labels.SelectorFromSet(controller.DesiredState.ReplicaSelector))
 	if err != nil {
 		return
 	}

pkg/kubectl/modify.go

@@ -93,14 +93,14 @@ func doUpdate(c *client.RESTClient, resource string, obj runtime.Object) (string
 	// object.
 	id, err := getIDFromObj(obj)
 	if err != nil {
-		return "", fmt.Errorf("ID not retrievable from object for update: %v", err)
+		return "", fmt.Errorf("Name not retrievable from object for update: %v", err)
 	}
 
 	// Get the object from the server to find out its current resource
 	// version to prevent race conditions in updating the object.
 	serverObj, err := c.Get().Path(resource).Path(id).Do().Get()
 	if err != nil {
-		return "", fmt.Errorf("Item ID %s does not exist for update: %v", id, err)
+		return "", fmt.Errorf("Item Name %s does not exist for update: %v", id, err)
 	}
 	version, err := getResourceVersionFromObj(serverObj)
 	if err != nil {
@@ -134,7 +134,10 @@ func doUpdate(c *client.RESTClient, resource string, obj runtime.Object) (string
 func doDelete(c *client.RESTClient, resource string, obj runtime.Object) (string, error) {
 	id, err := getIDFromObj(obj)
 	if err != nil {
-		return "", fmt.Errorf("ID not retrievable from object for update: %v", err)
+		return "", fmt.Errorf("Name not retrievable from object for delete: %v", err)
+	}
+	if id == "" {
+		return "", fmt.Errorf("The supplied resource has no Name and cannot be deleted")
 	}
 
 	err = c.Delete().Path(resource).Path(id).Do().Error()

pkg/kubectl/resource_printer.go

@@ -154,10 +154,10 @@ func (h *HumanReadablePrinter) validatePrintHandlerFunc(printFunc reflect.Value)
 	return nil
 }
 
-var podColumns = []string{"ID", "IMAGE(S)", "HOST", "LABELS", "STATUS"}
-var replicationControllerColumns = []string{"ID", "IMAGE(S)", "SELECTOR", "REPLICAS"}
-var serviceColumns = []string{"ID", "LABELS", "SELECTOR", "IP", "PORT"}
-var minionColumns = []string{"ID"}
+var podColumns = []string{"NAME", "IMAGE(S)", "HOST", "LABELS", "STATUS"}
+var replicationControllerColumns = []string{"NAME", "IMAGE(S)", "SELECTOR", "REPLICAS"}
+var serviceColumns = []string{"NAME", "LABELS", "SELECTOR", "IP", "PORT"}
+var minionColumns = []string{"NAME"}
 var statusColumns = []string{"STATUS"}
 
 // addDefaultHandlers adds print handlers for default Kubernetes types.
@@ -194,7 +194,7 @@ func podHostString(host, ip string) string {
 
 func printPod(pod *api.Pod, w io.Writer) error {
 	_, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n",
-		pod.ID, makeImageList(pod.DesiredState.Manifest),
+		pod.Name, makeImageList(pod.DesiredState.Manifest),
 		podHostString(pod.CurrentState.Host, pod.CurrentState.HostIP),
 		labels.Set(pod.Labels), pod.CurrentState.Status)
 	return err
@@ -209,16 +209,16 @@ func printPodList(podList *api.PodList, w io.Writer) error {
 	return nil
 }
 
-func printReplicationController(ctrl *api.ReplicationController, w io.Writer) error {
+func printReplicationController(controller *api.ReplicationController, w io.Writer) error {
 	_, err := fmt.Fprintf(w, "%s\t%s\t%s\t%d\n",
-		ctrl.ID, makeImageList(ctrl.DesiredState.PodTemplate.DesiredState.Manifest),
-		labels.Set(ctrl.DesiredState.ReplicaSelector), ctrl.DesiredState.Replicas)
+		controller.Name, makeImageList(controller.DesiredState.PodTemplate.DesiredState.Manifest),
+		labels.Set(controller.DesiredState.ReplicaSelector), controller.DesiredState.Replicas)
 	return err
 }
 
 func printReplicationControllerList(list *api.ReplicationControllerList, w io.Writer) error {
-	for _, ctrl := range list.Items {
-		if err := printReplicationController(&ctrl, w); err != nil {
+	for _, controller := range list.Items {
+		if err := printReplicationController(&controller, w); err != nil {
 			return err
 		}
 	}
@@ -226,7 +226,7 @@ func printReplicationControllerList(list *api.ReplicationControllerList, w io.Wr
 }
 
 func printService(svc *api.Service, w io.Writer) error {
-	_, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%d\n", svc.ID, labels.Set(svc.Labels),
+	_, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%d\n", svc.Name, labels.Set(svc.Labels),
 		labels.Set(svc.Selector), svc.PortalIP, svc.Port)
 	return err
 }
@@ -241,7 +241,7 @@ func printServiceList(list *api.ServiceList, w io.Writer) error {
 }
 
 func printMinion(minion *api.Minion, w io.Writer) error {
-	_, err := fmt.Fprintf(w, "%s\n", minion.ID)
+	_, err := fmt.Fprintf(w, "%s\n", minion.Name)
 	return err
 }
 

pkg/kubectl/resource_printer_test.go

@@ -69,7 +69,7 @@ func testPrinter(t *testing.T, printer ResourcePrinter, unmarshalFunc func(data
 	}
 
 	obj := &api.Pod{
-		TypeMeta: api.TypeMeta{ID: "foo"},
+		TypeMeta: api.TypeMeta{Name: "foo"},
 	}
 	buf.Reset()
 	printer.PrintObj(obj, buf)

pkg/kubelet/config/config.go

@@ -260,7 +260,7 @@ func filterInvalidPods(pods []api.BoundPod, source string) (filtered []*api.Boun
 		var errors []error
 		name := podUniqueName(&pods[i])
 		if names.Has(name) {
-			errors = append(errors, apierrs.NewFieldDuplicate("name", pods[i].ID))
+			errors = append(errors, apierrs.NewFieldDuplicate("name", pods[i].Name))
 		} else {
 			names.Insert(name)
 		}
@@ -268,7 +268,7 @@ func filterInvalidPods(pods []api.BoundPod, source string) (filtered []*api.Boun
 			errors = append(errors, errs...)
 		}
 		if len(errors) > 0 {
-			glog.Warningf("Pod %d (%s) from %s failed validation, ignoring: %v", i+1, pods[i].ID, source, errors)
+			glog.Warningf("Pod %d (%s) from %s failed validation, ignoring: %v", i+1, pods[i].Name, source, errors)
 			continue
 		}
 		filtered = append(filtered, &pods[i])
@@ -307,5 +307,5 @@ func podUniqueName(pod *api.BoundPod) string {
 	if len(namespace) == 0 {
 		namespace = api.NamespaceDefault
 	}
-	return fmt.Sprintf("%s.%s", pod.ID, namespace)
+	return fmt.Sprintf("%s.%s", pod.Name, namespace)
 }

pkg/kubelet/config/config_test.go

@@ -45,13 +45,13 @@ func (s sortedPods) Less(i, j int) bool {
 	if s[i].Namespace < s[j].Namespace {
 		return true
 	}
-	return s[i].ID < s[j].ID
+	return s[i].Name < s[j].Name
 }
 
 func CreateValidPod(name, namespace, source string) api.BoundPod {
 	return api.BoundPod{
 		TypeMeta: api.TypeMeta{
-			ID:          name,
+			Name:        name,
 			Namespace:   namespace,
 			Annotations: map[string]string{kubelet.ConfigSourceAnnotationKey: source},
 		},
@@ -158,7 +158,7 @@ func TestInvalidPodFiltered(t *testing.T) {
 	expectPodUpdate(t, ch, CreatePodUpdate(kubelet.ADD, CreateValidPod("foo", "new", "test")))
 
 	// add an invalid update
-	podUpdate = CreatePodUpdate(kubelet.UPDATE, api.BoundPod{TypeMeta: api.TypeMeta{ID: "foo"}})
+	podUpdate = CreatePodUpdate(kubelet.UPDATE, api.BoundPod{TypeMeta: api.TypeMeta{Name: "foo"}})
 	channel <- podUpdate
 	expectNoPodUpdate(t, ch)
 }
@@ -217,7 +217,7 @@ func TestNewPodAddedUpdatedRemoved(t *testing.T) {
 	channel <- podUpdate
 	expectPodUpdate(t, ch, CreatePodUpdate(kubelet.UPDATE, pod))
 
-	podUpdate = CreatePodUpdate(kubelet.REMOVE, api.BoundPod{TypeMeta: api.TypeMeta{ID: "foo", Namespace: "new"}})
+	podUpdate = CreatePodUpdate(kubelet.REMOVE, api.BoundPod{TypeMeta: api.TypeMeta{Name: "foo", Namespace: "new"}})
 	channel <- podUpdate
 	expectPodUpdate(t, ch, CreatePodUpdate(kubelet.REMOVE, pod))
 }

pkg/kubelet/config/etcd.go

@@ -95,8 +95,8 @@ func eventToPods(ev watch.Event) ([]api.BoundPod, error) {
 	}
 
 	for i, pod := range boundPods.Items {
-		if len(pod.ID) == 0 {
-			pod.ID = fmt.Sprintf("%d", i+1)
+		if len(pod.Name) == 0 {
+			pod.Name = fmt.Sprintf("%d", i+1)
 		}
 		// TODO: generate random UID if not present
 		if pod.UID == "" && !pod.CreationTimestamp.IsZero() {

pkg/kubelet/config/etcd_test.go

@@ -44,14 +44,14 @@ func TestEventToPods(t *testing.T) {
 			input: watch.Event{
 				Object: &api.BoundPods{
 					Items: []api.BoundPod{
-						{TypeMeta: api.TypeMeta{ID: "foo"}},
-						{TypeMeta: api.TypeMeta{ID: "bar"}},
+						{TypeMeta: api.TypeMeta{Name: "foo"}},
+						{TypeMeta: api.TypeMeta{Name: "bar"}},
 					},
 				},
 			},
 			pods: []api.BoundPod{
-				{TypeMeta: api.TypeMeta{ID: "foo", Namespace: "default"}, Spec: api.PodSpec{}},
-				{TypeMeta: api.TypeMeta{ID: "bar", Namespace: "default"}, Spec: api.PodSpec{}},
+				{TypeMeta: api.TypeMeta{Name: "foo", Namespace: "default"}, Spec: api.PodSpec{}},
+				{TypeMeta: api.TypeMeta{Name: "bar", Namespace: "default"}, Spec: api.PodSpec{}},
 			},
 			fail: false,
 		},
@@ -59,14 +59,14 @@ func TestEventToPods(t *testing.T) {
 			input: watch.Event{
 				Object: &api.BoundPods{
 					Items: []api.BoundPod{
-						{TypeMeta: api.TypeMeta{ID: "1"}},
-						{TypeMeta: api.TypeMeta{ID: "2", Namespace: "foo"}},
+						{TypeMeta: api.TypeMeta{Name: "1"}},
+						{TypeMeta: api.TypeMeta{Name: "2", Namespace: "foo"}},
 					},
 				},
 			},
 			pods: []api.BoundPod{
-				{TypeMeta: api.TypeMeta{ID: "1", Namespace: "default"}, Spec: api.PodSpec{}},
-				{TypeMeta: api.TypeMeta{ID: "2", Namespace: "foo"}, Spec: api.PodSpec{}},
+				{TypeMeta: api.TypeMeta{Name: "1", Namespace: "default"}, Spec: api.PodSpec{}},
+				{TypeMeta: api.TypeMeta{Name: "2", Namespace: "foo"}, Spec: api.PodSpec{}},
 			},
 			fail: false,
 		},

pkg/kubelet/config/file.go

@@ -153,7 +153,7 @@ func extractFromFile(filename string) (api.BoundPod, error) {
 		return pod, fmt.Errorf("can't convert pod from file %q: %v", filename, err)
 	}
 
-	pod.ID = simpleSubdomainSafeHash(filename)
+	pod.Name = simpleSubdomainSafeHash(filename)
 	if len(pod.UID) == 0 {
 		pod.UID = simpleSubdomainSafeHash(filename)
 	}
@@ -164,7 +164,7 @@ func extractFromFile(filename string) (api.BoundPod, error) {
 	if glog.V(4) {
 		glog.Infof("Got pod from file %q: %#v", filename, pod)
 	} else {
-		glog.V(1).Infof("Got pod from file %q: %s.%s (%s)", filename, pod.Namespace, pod.ID, pod.UID)
+		glog.V(1).Infof("Got pod from file %q: %s.%s (%s)", filename, pod.Namespace, pod.Name, pod.UID)
 	}
 	return pod, nil
 }

pkg/kubelet/config/file_test.go

@@ -53,7 +53,7 @@ func ExampleManifestAndPod(id string) (api.ContainerManifest, api.BoundPod) {
 	}
 	expectedPod := api.BoundPod{
 		TypeMeta: api.TypeMeta{
-			ID:        id,
+			Name:      id,
 			UID:       "uid",
 			Namespace: "default",
 		},
@@ -119,7 +119,7 @@ func TestReadFromFile(t *testing.T) {
 		update := got.(kubelet.PodUpdate)
 		expected := CreatePodUpdate(kubelet.SET, api.BoundPod{
 			TypeMeta: api.TypeMeta{
-				ID:        simpleSubdomainSafeHash(file.Name()),
+				Name:      simpleSubdomainSafeHash(file.Name()),
 				UID:       simpleSubdomainSafeHash(file.Name()),
 				Namespace: "default",
 			},
@@ -159,7 +159,7 @@ func TestExtractFromValidDataFile(t *testing.T) {
 	file := writeTestFile(t, os.TempDir(), "test_pod_config", string(text))
 	defer os.Remove(file.Name())
 
-	expectedPod.ID = simpleSubdomainSafeHash(file.Name())
+	expectedPod.Name = simpleSubdomainSafeHash(file.Name())
 
 	ch := make(chan interface{}, 1)
 	c := SourceFile{file.Name(), ch}
@@ -226,7 +226,7 @@ func TestExtractFromDir(t *testing.T) {
 		}
 		ioutil.WriteFile(name, data, 0755)
 		files[i] = file
-		pods[i].ID = simpleSubdomainSafeHash(name)
+		pods[i].Name = simpleSubdomainSafeHash(name)
 	}
 
 	ch := make(chan interface{}, 1)

pkg/kubelet/config/http.go

@@ -92,8 +92,8 @@ func (s *SourceURL) extractFromURL() error {
 		if err := api.Scheme.Convert(&manifest, &pod); err != nil {
 			return err
 		}
-		if len(pod.ID) == 0 {
-			pod.ID = "1"
+		if len(pod.Name) == 0 {
+			pod.Name = "1"
 		}
 		if len(pod.Namespace) == 0 {
 			pod.Namespace = api.NamespaceDefault
@@ -132,8 +132,8 @@ func (s *SourceURL) extractFromURL() error {
 		}
 		for i := range boundPods.Items {
 			pod := &boundPods.Items[i]
-			if len(pod.ID) == 0 {
-				pod.ID = fmt.Sprintf("%d", i+1)
+			if len(pod.Name) == 0 {
+				pod.Name = fmt.Sprintf("%d", i+1)
 			}
 			if len(pod.Namespace) == 0 {
 				pod.Namespace = api.NamespaceDefault

pkg/kubelet/config/http_test.go

@@ -125,7 +125,7 @@ func TestExtractFromHTTP(t *testing.T) {
 			expected: CreatePodUpdate(kubelet.SET,
 				api.BoundPod{
 					TypeMeta: api.TypeMeta{
-						ID:        "foo",
+						Name:      "foo",
 						Namespace: "default",
 					},
 					Spec: api.PodSpec{
@@ -142,14 +142,14 @@ func TestExtractFromHTTP(t *testing.T) {
 			expected: CreatePodUpdate(kubelet.SET,
 				api.BoundPod{
 					TypeMeta: api.TypeMeta{
-						ID:        "1",
+						Name:      "1",
 						Namespace: "default",
 					},
 					Spec: api.PodSpec{Containers: []api.Container{{Name: "1", Image: "foo"}}},
 				},
 				api.BoundPod{
 					TypeMeta: api.TypeMeta{
-						ID:        "bar",
+						Name:      "bar",
 						Namespace: "default",
 					},
 					Spec: api.PodSpec{Containers: []api.Container{{Name: "1", Image: "foo"}}},

pkg/kubelet/kubelet.go

@@ -279,7 +279,7 @@ func milliCPUToShares(milliCPU int) int {
 func (kl *Kubelet) mountExternalVolumes(pod *api.BoundPod) (volumeMap, error) {
 	podVolumes := make(volumeMap)
 	for _, vol := range pod.Spec.Volumes {
-		extVolume, err := volume.CreateVolumeBuilder(&vol, pod.ID, kl.rootDirectory)
+		extVolume, err := volume.CreateVolumeBuilder(&vol, pod.Name, kl.rootDirectory)
 		if err != nil {
 			return nil, err
 		}
@@ -334,7 +334,7 @@ func (kl *Kubelet) runContainer(pod *api.BoundPod, container *api.Container, pod
 			Cmd:          container.Command,
 			Env:          envVariables,
 			ExposedPorts: exposedPorts,
-			Hostname:     pod.ID,
+			Hostname:     pod.Name,
 			Image:        container.Image,
 			Memory:       int64(container.Memory),
 			CpuShares:    int64(milliCPUToShares(container.CPU)),
@@ -609,7 +609,7 @@ func getDesiredVolumes(pods []api.BoundPod) map[string]api.Volume {
 	desiredVolumes := make(map[string]api.Volume)
 	for _, pod := range pods {
 		for _, volume := range pod.Spec.Volumes {
-			identifier := path.Join(pod.ID, volume.Name)
+			identifier := path.Join(pod.Name, volume.Name)
 			desiredVolumes[identifier] = volume
 		}
 	}

pkg/kubelet/kubelet_test.go

@@ -114,7 +114,7 @@ func TestKillContainer(t *testing.T) {
 		},
 	}
 	fakeDocker.Container = &docker.Container{
-		ID: "foobar",
+		Name: "foobar",
 	}
 
 	err := kubelet.killContainer(&fakeDocker.ContainerList[0])
@@ -168,7 +168,7 @@ func TestSyncPodsDoesNothing(t *testing.T) {
 	err := kubelet.SyncPods([]api.BoundPod{
 		{
 			TypeMeta: api.TypeMeta{
-				ID:          "foo",
+				Name:        "foo",
 				Namespace:   "new",
 				Annotations: map[string]string{ConfigSourceAnnotationKey: "test"},
 			},
@@ -214,7 +214,7 @@ func TestSyncPodsCreatesNetAndContainer(t *testing.T) {
 	err := kubelet.SyncPods([]api.BoundPod{
 		{
 			TypeMeta: api.TypeMeta{
-				ID:          "foo",
+				Name:        "foo",
 				Namespace:   "new",
 				Annotations: map[string]string{ConfigSourceAnnotationKey: "test"},
 			},
@@ -262,7 +262,7 @@ func TestSyncPodsCreatesNetAndContainerPullsImage(t *testing.T) {
 	err := kubelet.SyncPods([]api.BoundPod{
 		{
 			TypeMeta: api.TypeMeta{
-				ID:          "foo",
+				Name:        "foo",
 				Namespace:   "new",
 				Annotations: map[string]string{ConfigSourceAnnotationKey: "test"},
 			},
@@ -307,7 +307,7 @@ func TestSyncPodsWithNetCreatesContainer(t *testing.T) {
 	err := kubelet.SyncPods([]api.BoundPod{
 		{
 			TypeMeta: api.TypeMeta{
-				ID:          "foo",
+				Name:        "foo",
 				Namespace:   "new",
 				Annotations: map[string]string{ConfigSourceAnnotationKey: "test"},
 			},
@@ -348,7 +348,7 @@ func TestSyncPodsWithNetCreatesContainerCallsHandler(t *testing.T) {
 	err := kubelet.SyncPods([]api.BoundPod{
 		{
 			TypeMeta: api.TypeMeta{
-				ID:          "foo",
+				Name:        "foo",
 				Namespace:   "new",
 				Annotations: map[string]string{ConfigSourceAnnotationKey: "test"},
 			},
@@ -401,7 +401,7 @@ func TestSyncPodsDeletesWithNoNetContainer(t *testing.T) {
 	err := kubelet.SyncPods([]api.BoundPod{
 		{
 			TypeMeta: api.TypeMeta{
-				ID:          "foo",
+				Name:        "foo",
 				Namespace:   "new",
 				Annotations: map[string]string{ConfigSourceAnnotationKey: "test"},
 			},
@@ -496,7 +496,7 @@ func TestSyncPodDeletesDuplicate(t *testing.T) {
 	}
 	err := kubelet.syncPod(&api.BoundPod{
 		TypeMeta: api.TypeMeta{
-			ID:          "bar",
+			Name:        "bar",
 			Namespace:   "new",
 			Annotations: map[string]string{ConfigSourceAnnotationKey: "test"},
 		},
@@ -545,7 +545,7 @@ func TestSyncPodBadHash(t *testing.T) {
 	}
 	err := kubelet.syncPod(&api.BoundPod{
 		TypeMeta: api.TypeMeta{
-			ID:          "foo",
+			Name:        "foo",
 			Namespace:   "new",
 			Annotations: map[string]string{ConfigSourceAnnotationKey: "test"},
 		},
@@ -589,7 +589,7 @@ func TestSyncPodUnhealthy(t *testing.T) {
 	}
 	err := kubelet.syncPod(&api.BoundPod{
 		TypeMeta: api.TypeMeta{
-			ID:          "foo",
+			Name:        "foo",
 			Namespace:   "new",
 			Annotations: map[string]string{ConfigSourceAnnotationKey: "test"},
 		},
@@ -649,7 +649,7 @@ func TestMountExternalVolumes(t *testing.T) {
 	kubelet, _, _ := newTestKubelet(t)
 	pod := api.BoundPod{
 		TypeMeta: api.TypeMeta{
-			ID:        "foo",
+			Name:      "foo",
 			Namespace: "test",
 		},
 		Spec: api.PodSpec{
@@ -704,7 +704,7 @@ func TestMakeVolumesAndBinds(t *testing.T) {
 
 	pod := api.BoundPod{
 		TypeMeta: api.TypeMeta{
-			ID:        "pod",
+			Name:      "pod",
 			Namespace: "test",
 		},
 	}
@@ -991,7 +991,7 @@ func TestRunInContainerNoSuchPod(t *testing.T) {
 	podNamespace := "etcd"
 	containerName := "containerFoo"
 	output, err := kubelet.RunInContainer(
-		GetPodFullName(&api.BoundPod{TypeMeta: api.TypeMeta{ID: podName, Namespace: podNamespace}}),
+		GetPodFullName(&api.BoundPod{TypeMeta: api.TypeMeta{Name: podName, Namespace: podNamespace}}),
 		"",
 		containerName,
 		[]string{"ls"})
@@ -1024,7 +1024,7 @@ func TestRunInContainer(t *testing.T) {
 	_, err := kubelet.RunInContainer(
 		GetPodFullName(&api.BoundPod{
 			TypeMeta: api.TypeMeta{
-				ID:          podName,
+				Name:        podName,
 				Namespace:   podNamespace,
 				Annotations: map[string]string{ConfigSourceAnnotationKey: "test"},
 			},
@@ -1033,7 +1033,7 @@ func TestRunInContainer(t *testing.T) {
 		containerName,
 		cmd)
 	if fakeCommandRunner.ID != containerID {
-		t.Errorf("unexected ID: %s", fakeCommandRunner.ID)
+		t.Errorf("unexected Name: %s", fakeCommandRunner.ID)
 	}
 	if !reflect.DeepEqual(fakeCommandRunner.Cmd, cmd) {
 		t.Errorf("unexpected commnd: %s", fakeCommandRunner.Cmd)
@@ -1166,7 +1166,7 @@ func TestSyncPodEventHandlerFails(t *testing.T) {
 	}
 	err := kubelet.syncPod(&api.BoundPod{
 		TypeMeta: api.TypeMeta{
-			ID:          "foo",
+			Name:        "foo",
 			Namespace:   "new",
 			Annotations: map[string]string{ConfigSourceAnnotationKey: "test"},
 		},

pkg/kubelet/runonce.go

@@ -73,10 +73,10 @@ func (kl *Kubelet) runOnce(pods []api.BoundPod) (results []RunPodResult, err err
 		results = append(results, res)
 		if res.Err != nil {
 			// TODO(proppy): report which containers failed the pod.
-			glog.Infof("failed to start pod %q: %v", res.Pod.ID, res.Err)
-			failedPods = append(failedPods, res.Pod.ID)
+			glog.Infof("failed to start pod %q: %v", res.Pod.Name, res.Err)
+			failedPods = append(failedPods, res.Pod.Name)
 		} else {
-			glog.Infof("started pod %q", res.Pod.ID)
+			glog.Infof("started pod %q", res.Pod.Name)
 		}
 	}
 	if len(failedPods) > 0 {
@@ -100,18 +100,18 @@ func (kl *Kubelet) runPod(pod api.BoundPod) error {
 			return fmt.Errorf("failed to check pod status: %v", err)
 		}
 		if running {
-			glog.Infof("pod %q containers running", pod.ID)
+			glog.Infof("pod %q containers running", pod.Name)
 			return nil
 		}
-		glog.Infof("pod %q containers not running: syncing", pod.ID)
+		glog.Infof("pod %q containers not running: syncing", pod.Name)
 		if err = kl.syncPod(&pod, dockerContainers); err != nil {
 			return fmt.Errorf("error syncing pod: %v", err)
 		}
 		if retry >= RunOnceMaxRetries {
-			return fmt.Errorf("timeout error: pod %q containers not running after %d retries", pod.ID, RunOnceMaxRetries)
+			return fmt.Errorf("timeout error: pod %q containers not running after %d retries", pod.Name, RunOnceMaxRetries)
 		}
 		// TODO(proppy): health checking would be better than waiting + checking the state at the next iteration.
-		glog.Infof("pod %q containers synced, waiting for %v", pod.ID, delay)
+		glog.Infof("pod %q containers synced, waiting for %v", pod.Name, delay)
 		<-time.After(delay)
 		retry++
 		delay *= RunOnceRetryDelayBackoff

pkg/kubelet/runonce_test.go

@@ -109,7 +109,7 @@ func TestRunOnce(t *testing.T) {
 	results, err := kb.runOnce([]api.BoundPod{
 		{
 			TypeMeta: api.TypeMeta{
-				ID:          "foo",
+				Name:        "foo",
 				Namespace:   "new",
 				Annotations: map[string]string{ConfigSourceAnnotationKey: "test"},
 			},
@@ -126,7 +126,7 @@ func TestRunOnce(t *testing.T) {
 	if results[0].Err != nil {
 		t.Errorf("unexpected run pod error: %v", results[0].Err)
 	}
-	if results[0].Pod.ID != "foo" {
-		t.Errorf("unexpected pod: %q", results[0].Pod.ID)
+	if results[0].Pod.Name != "foo" {
+		t.Errorf("unexpected pod: %q", results[0].Pod.Name)
 	}
 }

pkg/kubelet/server.go

@@ -126,14 +126,14 @@ func (s *Server) handleContainer(w http.ResponseWriter, req *http.Request) {
 		s.error(w, err)
 		return
 	}
-	pod.ID = containerManifest.ID
+	pod.Name = containerManifest.ID
 	pod.UID = containerManifest.UUID
 	pod.Spec.Containers = containerManifest.Containers
 	pod.Spec.Volumes = containerManifest.Volumes
 	pod.Spec.RestartPolicy = containerManifest.RestartPolicy
 	//TODO: sha1 of manifest?
-	if pod.ID == "" {
-		pod.ID = "1"
+	if pod.Name == "" {
+		pod.Name = "1"
 	}
 	if pod.UID == "" {
 		pod.UID = "1"
@@ -158,7 +158,7 @@ func (s *Server) handleContainers(w http.ResponseWriter, req *http.Request) {
 	}
 	pods := make([]api.BoundPod, len(specs))
 	for i := range specs {
-		pods[i].ID = fmt.Sprintf("%d", i+1)
+		pods[i].Name = fmt.Sprintf("%d", i+1)
 		pods[i].Spec = specs[i]
 	}
 	s.updates <- PodUpdate{pods, SET}
@@ -205,7 +205,7 @@ func (s *Server) handleContainerLogs(w http.ResponseWriter, req *http.Request) {
 
 	podFullName := GetPodFullName(&api.BoundPod{
 		TypeMeta: api.TypeMeta{
-			ID:          podID,
+			Name:        podID,
 			Namespace:   podNamespace,
 			Annotations: map[string]string{ConfigSourceAnnotationKey: "etcd"},
 		},
@@ -249,7 +249,7 @@ func (s *Server) handlePodInfo(w http.ResponseWriter, req *http.Request) {
 	// TODO: backwards compatibility with existing API, needs API change
 	podFullName := GetPodFullName(&api.BoundPod{
 		TypeMeta: api.TypeMeta{
-			ID:          podID,
+			Name:        podID,
 			Namespace:   podNamespace,
 			Annotations: map[string]string{ConfigSourceAnnotationKey: "etcd"},
 		},
@@ -324,7 +324,7 @@ func (s *Server) handleRun(w http.ResponseWriter, req *http.Request) {
 	}
 	podFullName := GetPodFullName(&api.BoundPod{
 		TypeMeta: api.TypeMeta{
-			ID:          podID,
+			Name:        podID,
 			Namespace:   podNamespace,
 			Annotations: map[string]string{ConfigSourceAnnotationKey: "etcd"},
 		},
@@ -374,7 +374,7 @@ func (s *Server) serveStats(w http.ResponseWriter, req *http.Request) {
 		// Backward compatibility without uuid information
 		podFullName := GetPodFullName(&api.BoundPod{
 			TypeMeta: api.TypeMeta{
-				ID: components[1],
+				Name: components[1],
 				// TODO: I am broken
 				Namespace:   api.NamespaceDefault,
 				Annotations: map[string]string{ConfigSourceAnnotationKey: "etcd"},
@@ -384,7 +384,7 @@ func (s *Server) serveStats(w http.ResponseWriter, req *http.Request) {
 	case 4:
 		podFullName := GetPodFullName(&api.BoundPod{
 			TypeMeta: api.TypeMeta{
-				ID: components[1],
+				Name: components[1],
 				// TODO: I am broken
 				Namespace:   "",
 				Annotations: map[string]string{ConfigSourceAnnotationKey: "etcd"},

pkg/kubelet/server_test.go

@@ -133,8 +133,8 @@ func TestContainer(t *testing.T) {
 	expectedPods := []api.BoundPod{
 		{
 			TypeMeta: api.TypeMeta{
-				ID:  "test_manifest",
-				UID: "value",
+				Name: "test_manifest",
+				UID:  "value",
 			},
 			Spec: api.PodSpec{
 				Containers: []api.Container{
@@ -208,7 +208,7 @@ func TestContainers(t *testing.T) {
 	expectedPods := []api.BoundPod{
 		{
 			TypeMeta: api.TypeMeta{
-				ID: "1",
+				Name: "1",
 			},
 			Spec: api.PodSpec{
 				Containers: []api.Container{
@@ -228,7 +228,7 @@ func TestContainers(t *testing.T) {
 		},
 		{
 			TypeMeta: api.TypeMeta{
-				ID: "2",
+				Name: "2",
 			},
 			Spec: api.PodSpec{
 				Containers: []api.Container{

pkg/kubelet/types.go

@@ -50,5 +50,5 @@ type PodUpdate struct {
 
 // GetPodFullName returns a name that uniquely identifies a pod across all config sources.
 func GetPodFullName(pod *api.BoundPod) string {
-	return fmt.Sprintf("%s.%s.%s", pod.ID, pod.Namespace, pod.Annotations[ConfigSourceAnnotationKey])
+	return fmt.Sprintf("%s.%s.%s", pod.Name, pod.Namespace, pod.Annotations[ConfigSourceAnnotationKey])
 }

pkg/master/master.go

@@ -126,7 +126,7 @@ func (m *Master) init(c *Config) {
 	} else {
 		for _, minionID := range c.Minions {
 			m.minionRegistry.CreateMinion(nil, &api.Minion{
-				TypeMeta:      api.TypeMeta{ID: minionID},
+				TypeMeta:      api.TypeMeta{Name: minionID},
 				NodeResources: c.NodeResources,
 			})
 		}

pkg/master/pod_cache.go

@@ -87,7 +87,7 @@ func (p *PodCache) UpdateAllContainers() {
 		if pod.CurrentState.Host == "" {
 			continue
 		}
-		err := p.updatePodInfo(pod.CurrentState.Host, pod.Namespace, pod.ID)
+		err := p.updatePodInfo(pod.CurrentState.Host, pod.Namespace, pod.Name)
 		if err != nil && err != client.ErrPodInfoNotAvailable {
 			glog.Errorf("Error synchronizing container: %v", err)
 		}

pkg/master/pod_cache_test.go

@@ -124,7 +124,7 @@ func TestPodGetPodInfoGetter(t *testing.T) {
 
 func TestPodUpdateAllContainers(t *testing.T) {
 	pod := api.Pod{
-		TypeMeta: api.TypeMeta{ID: "foo", Namespace: api.NamespaceDefault},
+		TypeMeta: api.TypeMeta{Name: "foo", Namespace: api.NamespaceDefault},
 		CurrentState: api.PodState{
 			Host: "machine",
 		},

pkg/proxy/config/api_test.go

@@ -27,7 +27,7 @@ import (
 )
 
 func TestServices(t *testing.T) {
-	service := api.Service{TypeMeta: api.TypeMeta{ID: "bar", ResourceVersion: "2"}}
+	service := api.Service{TypeMeta: api.TypeMeta{Name: "bar", ResourceVersion: "2"}}
 
 	fakeWatch := watch.NewFake()
 	fakeClient := &client.Fake{Watch: fakeWatch}
@@ -72,7 +72,7 @@ func TestServices(t *testing.T) {
 }
 
 func TestServicesFromZero(t *testing.T) {
-	service := api.Service{TypeMeta: api.TypeMeta{ID: "bar", ResourceVersion: "2"}}
+	service := api.Service{TypeMeta: api.TypeMeta{Name: "bar", ResourceVersion: "2"}}
 
 	fakeWatch := watch.NewFake()
 	fakeWatch.Stop()
@@ -152,7 +152,7 @@ func TestServicesFromZeroError(t *testing.T) {
 }
 
 func TestEndpoints(t *testing.T) {
-	endpoint := api.Endpoints{TypeMeta: api.TypeMeta{ID: "bar", ResourceVersion: "2"}, Endpoints: []string{"127.0.0.1:9000"}}
+	endpoint := api.Endpoints{TypeMeta: api.TypeMeta{Name: "bar", ResourceVersion: "2"}, Endpoints: []string{"127.0.0.1:9000"}}
 
 	fakeWatch := watch.NewFake()
 	fakeClient := &client.Fake{Watch: fakeWatch}
@@ -197,7 +197,7 @@ func TestEndpoints(t *testing.T) {
 }
 
 func TestEndpointsFromZero(t *testing.T) {
-	endpoint := api.Endpoints{TypeMeta: api.TypeMeta{ID: "bar", ResourceVersion: "2"}, Endpoints: []string{"127.0.0.1:9000"}}
+	endpoint := api.Endpoints{TypeMeta: api.TypeMeta{Name: "bar", ResourceVersion: "2"}, Endpoints: []string{"127.0.0.1:9000"}}
 
 	fakeWatch := watch.NewFake()
 	fakeWatch.Stop()

pkg/proxy/config/config.go

@@ -127,19 +127,19 @@ func (s *endpointsStore) Merge(source string, change interface{}) error {
 	case ADD:
 		glog.V(4).Infof("Adding new endpoint from source %s : %v", source, update.Endpoints)
 		for _, value := range update.Endpoints {
-			endpoints[value.ID] = value
+			endpoints[value.Name] = value
 		}
 	case REMOVE:
 		glog.V(4).Infof("Removing an endpoint %v", update)
 		for _, value := range update.Endpoints {
-			delete(endpoints, value.ID)
+			delete(endpoints, value.Name)
 		}
 	case SET:
 		glog.V(4).Infof("Setting endpoints %v", update)
 		// Clear the old map entries by just creating a new map
 		endpoints = make(map[string]api.Endpoints)
 		for _, value := range update.Endpoints {
-			endpoints[value.ID] = value
+			endpoints[value.Name] = value
 		}
 	default:
 		glog.V(4).Infof("Received invalid update type: %v", update)
@@ -222,19 +222,19 @@ func (s *serviceStore) Merge(source string, change interface{}) error {
 	case ADD:
 		glog.V(4).Infof("Adding new service from source %s : %v", source, update.Services)
 		for _, value := range update.Services {
-			services[value.ID] = value
+			services[value.Name] = value
 		}
 	case REMOVE:
 		glog.V(4).Infof("Removing a service %v", update)
 		for _, value := range update.Services {
-			delete(services, value.ID)
+			delete(services, value.Name)
 		}
 	case SET:
 		glog.V(4).Infof("Setting services %v", update)
 		// Clear the old map entries by just creating a new map
 		services = make(map[string]api.Service)
 		for _, value := range update.Services {
-			services[value.ID] = value
+			services[value.Name] = value
 		}
 	default:
 		glog.V(4).Infof("Received invalid update type: %v", update)

pkg/proxy/config/config_test.go

@@ -45,7 +45,7 @@ func (s sortedServices) Swap(i, j int) {
 	s[i], s[j] = s[j], s[i]
 }
 func (s sortedServices) Less(i, j int) bool {
-	return s[i].TypeMeta.ID < s[j].TypeMeta.ID
+	return s[i].Name < s[j].Name
 }
 
 type ServiceHandlerMock struct {
@@ -83,7 +83,7 @@ func (s sortedEndpoints) Swap(i, j int) {
 	s[i], s[j] = s[j], s[i]
 }
 func (s sortedEndpoints) Less(i, j int) bool {
-	return s[i].ID < s[j].ID
+	return s[i].Name < s[j].Name
 }
 
 type EndpointsHandlerMock struct {
@@ -136,7 +136,7 @@ func TestNewServiceAddedAndNotified(t *testing.T) {
 	handler := NewServiceHandlerMock()
 	handler.Wait(1)
 	config.RegisterHandler(handler)
-	serviceUpdate := CreateServiceUpdate(ADD, api.Service{TypeMeta: api.TypeMeta{ID: "foo"}, Port: 10})
+	serviceUpdate := CreateServiceUpdate(ADD, api.Service{TypeMeta: api.TypeMeta{Name: "foo"}, Port: 10})
 	channel <- serviceUpdate
 	handler.ValidateServices(t, serviceUpdate.Services)
 
@@ -147,24 +147,24 @@ func TestServiceAddedRemovedSetAndNotified(t *testing.T) {
 	channel := config.Channel("one")
 	handler := NewServiceHandlerMock()
 	config.RegisterHandler(handler)
-	serviceUpdate := CreateServiceUpdate(ADD, api.Service{TypeMeta: api.TypeMeta{ID: "foo"}, Port: 10})
+	serviceUpdate := CreateServiceUpdate(ADD, api.Service{TypeMeta: api.TypeMeta{Name: "foo"}, Port: 10})
 	handler.Wait(1)
 	channel <- serviceUpdate
 	handler.ValidateServices(t, serviceUpdate.Services)
 
-	serviceUpdate2 := CreateServiceUpdate(ADD, api.Service{TypeMeta: api.TypeMeta{ID: "bar"}, Port: 20})
+	serviceUpdate2 := CreateServiceUpdate(ADD, api.Service{TypeMeta: api.TypeMeta{Name: "bar"}, Port: 20})
 	handler.Wait(1)
 	channel <- serviceUpdate2
 	services := []api.Service{serviceUpdate2.Services[0], serviceUpdate.Services[0]}
 	handler.ValidateServices(t, services)
 
-	serviceUpdate3 := CreateServiceUpdate(REMOVE, api.Service{TypeMeta: api.TypeMeta{ID: "foo"}})
+	serviceUpdate3 := CreateServiceUpdate(REMOVE, api.Service{TypeMeta: api.TypeMeta{Name: "foo"}})
 	handler.Wait(1)
 	channel <- serviceUpdate3
 	services = []api.Service{serviceUpdate2.Services[0]}
 	handler.ValidateServices(t, services)
 
-	serviceUpdate4 := CreateServiceUpdate(SET, api.Service{TypeMeta: api.TypeMeta{ID: "foobar"}, Port: 99})
+	serviceUpdate4 := CreateServiceUpdate(SET, api.Service{TypeMeta: api.TypeMeta{Name: "foobar"}, Port: 99})
 	handler.Wait(1)
 	channel <- serviceUpdate4
 	services = []api.Service{serviceUpdate4.Services[0]}
@@ -180,8 +180,8 @@ func TestNewMultipleSourcesServicesAddedAndNotified(t *testing.T) {
 	}
 	handler := NewServiceHandlerMock()
 	config.RegisterHandler(handler)
-	serviceUpdate1 := CreateServiceUpdate(ADD, api.Service{TypeMeta: api.TypeMeta{ID: "foo"}, Port: 10})
-	serviceUpdate2 := CreateServiceUpdate(ADD, api.Service{TypeMeta: api.TypeMeta{ID: "bar"}, Port: 20})
+	serviceUpdate1 := CreateServiceUpdate(ADD, api.Service{TypeMeta: api.TypeMeta{Name: "foo"}, Port: 10})
+	serviceUpdate2 := CreateServiceUpdate(ADD, api.Service{TypeMeta: api.TypeMeta{Name: "bar"}, Port: 20})
 	handler.Wait(2)
 	channelOne <- serviceUpdate1
 	channelTwo <- serviceUpdate2
@@ -197,8 +197,8 @@ func TestNewMultipleSourcesServicesMultipleHandlersAddedAndNotified(t *testing.T
 	handler2 := NewServiceHandlerMock()
 	config.RegisterHandler(handler)
 	config.RegisterHandler(handler2)
-	serviceUpdate1 := CreateServiceUpdate(ADD, api.Service{TypeMeta: api.TypeMeta{ID: "foo"}, Port: 10})
-	serviceUpdate2 := CreateServiceUpdate(ADD, api.Service{TypeMeta: api.TypeMeta{ID: "bar"}, Port: 20})
+	serviceUpdate1 := CreateServiceUpdate(ADD, api.Service{TypeMeta: api.TypeMeta{Name: "foo"}, Port: 10})
+	serviceUpdate2 := CreateServiceUpdate(ADD, api.Service{TypeMeta: api.TypeMeta{Name: "bar"}, Port: 20})
 	handler.Wait(2)
 	handler2.Wait(2)
 	channelOne <- serviceUpdate1
@@ -217,11 +217,11 @@ func TestNewMultipleSourcesEndpointsMultipleHandlersAddedAndNotified(t *testing.
 	config.RegisterHandler(handler)
 	config.RegisterHandler(handler2)
 	endpointsUpdate1 := CreateEndpointsUpdate(ADD, api.Endpoints{
-		TypeMeta:  api.TypeMeta{ID: "foo"},
+		TypeMeta:  api.TypeMeta{Name: "foo"},
 		Endpoints: []string{"endpoint1", "endpoint2"},
 	})
 	endpointsUpdate2 := CreateEndpointsUpdate(ADD, api.Endpoints{
-		TypeMeta:  api.TypeMeta{ID: "bar"},
+		TypeMeta:  api.TypeMeta{Name: "bar"},
 		Endpoints: []string{"endpoint3", "endpoint4"},
 	})
 	handler.Wait(2)
@@ -243,11 +243,11 @@ func TestNewMultipleSourcesEndpointsMultipleHandlersAddRemoveSetAndNotified(t *t
 	config.RegisterHandler(handler)
 	config.RegisterHandler(handler2)
 	endpointsUpdate1 := CreateEndpointsUpdate(ADD, api.Endpoints{
-		TypeMeta:  api.TypeMeta{ID: "foo"},
+		TypeMeta:  api.TypeMeta{Name: "foo"},
 		Endpoints: []string{"endpoint1", "endpoint2"},
 	})
 	endpointsUpdate2 := CreateEndpointsUpdate(ADD, api.Endpoints{
-		TypeMeta:  api.TypeMeta{ID: "bar"},
+		TypeMeta:  api.TypeMeta{Name: "bar"},
 		Endpoints: []string{"endpoint3", "endpoint4"},
 	})
 	handler.Wait(2)
@@ -261,7 +261,7 @@ func TestNewMultipleSourcesEndpointsMultipleHandlersAddRemoveSetAndNotified(t *t
 
 	// Add one more
 	endpointsUpdate3 := CreateEndpointsUpdate(ADD, api.Endpoints{
-		TypeMeta:  api.TypeMeta{ID: "foobar"},
+		TypeMeta:  api.TypeMeta{Name: "foobar"},
 		Endpoints: []string{"endpoint5", "endpoint6"},
 	})
 	handler.Wait(1)
@@ -273,7 +273,7 @@ func TestNewMultipleSourcesEndpointsMultipleHandlersAddRemoveSetAndNotified(t *t
 
 	// Update the "foo" service with new endpoints
 	endpointsUpdate1 = CreateEndpointsUpdate(ADD, api.Endpoints{
-		TypeMeta:  api.TypeMeta{ID: "foo"},
+		TypeMeta:  api.TypeMeta{Name: "foo"},
 		Endpoints: []string{"endpoint77"},
 	})
 	handler.Wait(1)
@@ -284,7 +284,7 @@ func TestNewMultipleSourcesEndpointsMultipleHandlersAddRemoveSetAndNotified(t *t
 	handler2.ValidateEndpoints(t, endpoints)
 
 	// Remove "bar" service
-	endpointsUpdate2 = CreateEndpointsUpdate(REMOVE, api.Endpoints{TypeMeta: api.TypeMeta{ID: "bar"}})
+	endpointsUpdate2 = CreateEndpointsUpdate(REMOVE, api.Endpoints{TypeMeta: api.TypeMeta{Name: "bar"}})
 	handler.Wait(1)
 	handler2.Wait(1)
 	channelTwo <- endpointsUpdate2

pkg/proxy/config/etcd.go

@@ -140,15 +140,15 @@ func (s ConfigSourceEtcd) decodeServices(node *etcd.Node, retServices []api.Serv
 		// so we got a service we can handle, and now get endpoints
 		retServices = append(retServices, svc)
 		// get the endpoints
-		endpoints, err := s.GetEndpoints(svc.Namespace, svc.ID)
+		endpoints, err := s.GetEndpoints(svc.Namespace, svc.Name)
 		if err != nil {
 			if tools.IsEtcdNotFound(err) {
-				glog.V(4).Infof("Unable to get endpoints for %s %s : %v", svc.Namespace, svc.ID, err)
+				glog.V(4).Infof("Unable to get endpoints for %s %s : %v", svc.Namespace, svc.Name, err)
 			}
-			glog.Errorf("Couldn't get endpoints for %s %s : %v skipping", svc.Namespace, svc.ID, err)
+			glog.Errorf("Couldn't get endpoints for %s %s : %v skipping", svc.Namespace, svc.Name, err)
 			endpoints = api.Endpoints{}
 		} else {
-			glog.V(3).Infof("Got service: %s %s on localport %d mapping to: %s", svc.Namespace, svc.ID, svc.Port, endpoints)
+			glog.V(3).Infof("Got service: %s %s on localport %d mapping to: %s", svc.Namespace, svc.Name, svc.Port, endpoints)
 		}
 		retEndpoints = append(retEndpoints, endpoints)
 	}
@@ -243,7 +243,7 @@ func (s ConfigSourceEtcd) ProcessChange(response *etcd.Response) {
 		parts := strings.Split(response.Node.Key[1:], "/")
 		if len(parts) == 4 {
 			glog.V(4).Infof("Deleting service: %s", parts[3])
-			serviceUpdate := ServiceUpdate{Op: REMOVE, Services: []api.Service{{TypeMeta: api.TypeMeta{ID: parts[3]}}}}
+			serviceUpdate := ServiceUpdate{Op: REMOVE, Services: []api.Service{{TypeMeta: api.TypeMeta{Name: parts[3]}}}}
 			s.serviceChannel <- serviceUpdate
 			return
 		}

pkg/proxy/proxier.go

@@ -433,35 +433,35 @@ func (proxier *Proxier) OnUpdate(services []api.Service) {
 	glog.V(4).Infof("Received update notice: %+v", services)
 	activeServices := util.StringSet{}
 	for _, service := range services {
-		activeServices.Insert(service.ID)
-		info, exists := proxier.getServiceInfo(service.ID)
+		activeServices.Insert(service.Name)
+		info, exists := proxier.getServiceInfo(service.Name)
 		serviceIP := net.ParseIP(service.PortalIP)
 		// TODO: check health of the socket?  What if ProxyLoop exited?
 		if exists && info.isActive() && info.portalPort == service.Port && info.portalIP.Equal(serviceIP) {
 			continue
 		}
 		if exists && (info.portalPort != service.Port || !info.portalIP.Equal(serviceIP)) {
-			glog.V(4).Infof("Something changed for service %q: stopping it", service.ID)
-			err := proxier.closePortal(service.ID, info)
+			glog.V(4).Infof("Something changed for service %q: stopping it", service.Name)
+			err := proxier.closePortal(service.Name, info)
 			if err != nil {
-				glog.Errorf("Failed to close portal for %q: %s", service.ID, err)
+				glog.Errorf("Failed to close portal for %q: %s", service.Name, err)
 			}
-			err = proxier.stopProxy(service.ID, info)
+			err = proxier.stopProxy(service.Name, info)
 			if err != nil {
-				glog.Errorf("Failed to stop service %q: %s", service.ID, err)
+				glog.Errorf("Failed to stop service %q: %s", service.Name, err)
 			}
 		}
-		glog.V(1).Infof("Adding new service %q at %s:%d/%s (local :%d)", service.ID, serviceIP, service.Port, service.Protocol, service.ProxyPort)
-		info, err := proxier.addServiceOnPort(service.ID, service.Protocol, service.ProxyPort, udpIdleTimeout)
+		glog.V(1).Infof("Adding new service %q at %s:%d/%s (local :%d)", service.Name, serviceIP, service.Port, service.Protocol, service.ProxyPort)
+		info, err := proxier.addServiceOnPort(service.Name, service.Protocol, service.ProxyPort, udpIdleTimeout)
 		if err != nil {
-			glog.Errorf("Failed to start proxy for %q: %+v", service.ID, err)
+			glog.Errorf("Failed to start proxy for %q: %+v", service.Name, err)
 			continue
 		}
 		info.portalIP = serviceIP
 		info.portalPort = service.Port
-		err = proxier.openPortal(service.ID, info)
+		err = proxier.openPortal(service.Name, info)
 		if err != nil {
-			glog.Errorf("Failed to open portal for %q: %s", service.ID, err)
+			glog.Errorf("Failed to open portal for %q: %s", service.Name, err)
 		}
 	}
 	proxier.mu.Lock()

pkg/proxy/proxier_test.go

@@ -163,7 +163,7 @@ func TestTCPProxy(t *testing.T) {
 	lb := NewLoadBalancerRR()
 	lb.OnUpdate([]api.Endpoints{
 		{
-			TypeMeta:  api.TypeMeta{ID: "echo"},
+			TypeMeta:  api.TypeMeta{Name: "echo"},
 			Endpoints: []string{net.JoinHostPort("127.0.0.1", tcpServerPort)},
 		},
 	})
@@ -181,7 +181,7 @@ func TestUDPProxy(t *testing.T) {
 	lb := NewLoadBalancerRR()
 	lb.OnUpdate([]api.Endpoints{
 		{
-			TypeMeta:  api.TypeMeta{ID: "echo"},
+			TypeMeta:  api.TypeMeta{Name: "echo"},
 			Endpoints: []string{net.JoinHostPort("127.0.0.1", udpServerPort)},
 		},
 	})
@@ -208,7 +208,7 @@ func TestTCPProxyStop(t *testing.T) {
 	lb := NewLoadBalancerRR()
 	lb.OnUpdate([]api.Endpoints{
 		{
-			TypeMeta:  api.TypeMeta{ID: "echo"},
+			TypeMeta:  api.TypeMeta{Name: "echo"},
 			Endpoints: []string{net.JoinHostPort("127.0.0.1", tcpServerPort)},
 		},
 	})
@@ -236,7 +236,7 @@ func TestUDPProxyStop(t *testing.T) {
 	lb := NewLoadBalancerRR()
 	lb.OnUpdate([]api.Endpoints{
 		{
-			TypeMeta:  api.TypeMeta{ID: "echo"},
+			TypeMeta:  api.TypeMeta{Name: "echo"},
 			Endpoints: []string{net.JoinHostPort("127.0.0.1", udpServerPort)},
 		},
 	})
@@ -264,7 +264,7 @@ func TestTCPProxyUpdateDelete(t *testing.T) {
 	lb := NewLoadBalancerRR()
 	lb.OnUpdate([]api.Endpoints{
 		{
-			TypeMeta:  api.TypeMeta{ID: "echo"},
+			TypeMeta:  api.TypeMeta{Name: "echo"},
 			Endpoints: []string{net.JoinHostPort("127.0.0.1", tcpServerPort)},
 		},
 	})
@@ -291,7 +291,7 @@ func TestUDPProxyUpdateDelete(t *testing.T) {
 	lb := NewLoadBalancerRR()
 	lb.OnUpdate([]api.Endpoints{
 		{
-			TypeMeta:  api.TypeMeta{ID: "echo"},
+			TypeMeta:  api.TypeMeta{Name: "echo"},
 			Endpoints: []string{net.JoinHostPort("127.0.0.1", udpServerPort)},
 		},
 	})
@@ -318,7 +318,7 @@ func TestTCPProxyUpdateDeleteUpdate(t *testing.T) {
 	lb := NewLoadBalancerRR()
 	lb.OnUpdate([]api.Endpoints{
 		{
-			TypeMeta:  api.TypeMeta{ID: "echo"},
+			TypeMeta:  api.TypeMeta{Name: "echo"},
 			Endpoints: []string{net.JoinHostPort("127.0.0.1", tcpServerPort)},
 		},
 	})
@@ -340,7 +340,7 @@ func TestTCPProxyUpdateDeleteUpdate(t *testing.T) {
 		t.Fatalf(err.Error())
 	}
 	p.OnUpdate([]api.Service{
-		{TypeMeta: api.TypeMeta{ID: "echo"}, Port: svcInfo.proxyPort, ProxyPort: svcInfo.proxyPort, Protocol: "TCP"},
+		{TypeMeta: api.TypeMeta{Name: "echo"}, Port: svcInfo.proxyPort, ProxyPort: svcInfo.proxyPort, Protocol: "TCP"},
 	})
 	testEchoTCP(t, "127.0.0.1", svcInfo.proxyPort)
 }
@@ -349,7 +349,7 @@ func TestUDPProxyUpdateDeleteUpdate(t *testing.T) {
 	lb := NewLoadBalancerRR()
 	lb.OnUpdate([]api.Endpoints{
 		{
-			TypeMeta:  api.TypeMeta{ID: "echo"},
+			TypeMeta:  api.TypeMeta{Name: "echo"},
 			Endpoints: []string{net.JoinHostPort("127.0.0.1", udpServerPort)},
 		},
 	})
@@ -371,7 +371,7 @@ func TestUDPProxyUpdateDeleteUpdate(t *testing.T) {
 		t.Fatalf(err.Error())
 	}
 	p.OnUpdate([]api.Service{
-		{TypeMeta: api.TypeMeta{ID: "echo"}, Port: svcInfo.proxyPort, ProxyPort: svcInfo.proxyPort, Protocol: "UDP"},
+		{TypeMeta: api.TypeMeta{Name: "echo"}, Port: svcInfo.proxyPort, ProxyPort: svcInfo.proxyPort, Protocol: "UDP"},
 	})
 	testEchoUDP(t, "127.0.0.1", svcInfo.proxyPort)
 }
@@ -380,7 +380,7 @@ func TestTCPProxyUpdatePort(t *testing.T) {
 	lb := NewLoadBalancerRR()
 	lb.OnUpdate([]api.Endpoints{
 		{
-			TypeMeta:  api.TypeMeta{ID: "echo"},
+			TypeMeta:  api.TypeMeta{Name: "echo"},
 			Endpoints: []string{net.JoinHostPort("127.0.0.1", tcpServerPort)},
 		},
 	})
@@ -406,7 +406,7 @@ func TestTCPProxyUpdatePort(t *testing.T) {
 		t.Errorf("expected difference, got %d %d", newPort, svcInfo.proxyPort)
 	}
 	p.OnUpdate([]api.Service{
-		{TypeMeta: api.TypeMeta{ID: "echo"}, Port: newPort, ProxyPort: newPort, Protocol: "TCP"},
+		{TypeMeta: api.TypeMeta{Name: "echo"}, Port: newPort, ProxyPort: newPort, Protocol: "TCP"},
 	})
 	if err := waitForClosedPortTCP(p, svcInfo.proxyPort); err != nil {
 		t.Fatalf(err.Error())
@@ -425,7 +425,7 @@ func TestUDPProxyUpdatePort(t *testing.T) {
 	lb := NewLoadBalancerRR()
 	lb.OnUpdate([]api.Endpoints{
 		{
-			TypeMeta:  api.TypeMeta{ID: "echo"},
+			TypeMeta:  api.TypeMeta{Name: "echo"},
 			Endpoints: []string{net.JoinHostPort("127.0.0.1", udpServerPort)},
 		},
 	})
@@ -451,7 +451,7 @@ func TestUDPProxyUpdatePort(t *testing.T) {
 		t.Errorf("expected difference, got %d %d", newPort, svcInfo.proxyPort)
 	}
 	p.OnUpdate([]api.Service{
-		{TypeMeta: api.TypeMeta{ID: "echo"}, Port: newPort, ProxyPort: newPort, Protocol: "UDP"},
+		{TypeMeta: api.TypeMeta{Name: "echo"}, Port: newPort, ProxyPort: newPort, Protocol: "UDP"},
 	})
 	if err := waitForClosedPortUDP(p, svcInfo.proxyPort); err != nil {
 		t.Fatalf(err.Error())

pkg/proxy/roundrobin.go

@@ -98,15 +98,15 @@ func (lb *LoadBalancerRR) OnUpdate(endpoints []api.Endpoints) {
 	defer lb.lock.Unlock()
 	// Update endpoints for services.
 	for _, endpoint := range endpoints {
-		existingEndpoints, exists := lb.endpointsMap[endpoint.ID]
+		existingEndpoints, exists := lb.endpointsMap[endpoint.Name]
 		validEndpoints := filterValidEndpoints(endpoint.Endpoints)
 		if !exists || !reflect.DeepEqual(existingEndpoints, validEndpoints) {
-			glog.V(3).Infof("LoadBalancerRR: Setting endpoints for %s to %+v", endpoint.ID, endpoint.Endpoints)
-			lb.endpointsMap[endpoint.ID] = validEndpoints
+			glog.V(3).Infof("LoadBalancerRR: Setting endpoints for %s to %+v", endpoint.Name, endpoint.Endpoints)
+			lb.endpointsMap[endpoint.Name] = validEndpoints
 			// Reset the round-robin index.
-			lb.rrIndex[endpoint.ID] = 0
+			lb.rrIndex[endpoint.Name] = 0
 		}
-		registeredEndpoints[endpoint.ID] = true
+		registeredEndpoints[endpoint.Name] = true
 	}
 	// Remove endpoints missing from the update.
 	for k, v := range lb.endpointsMap {

pkg/proxy/roundrobin_test.go

@@ -86,7 +86,7 @@ func TestLoadBalanceWorksWithSingleEndpoint(t *testing.T) {
 	}
 	endpoints := make([]api.Endpoints, 1)
 	endpoints[0] = api.Endpoints{
-		TypeMeta:  api.TypeMeta{ID: "foo"},
+		TypeMeta:  api.TypeMeta{Name: "foo"},
 		Endpoints: []string{"endpoint1:40"},
 	}
 	loadBalancer.OnUpdate(endpoints)
@@ -104,7 +104,7 @@ func TestLoadBalanceWorksWithMultipleEndpoints(t *testing.T) {
 	}
 	endpoints := make([]api.Endpoints, 1)
 	endpoints[0] = api.Endpoints{
-		TypeMeta:  api.TypeMeta{ID: "foo"},
+		TypeMeta:  api.TypeMeta{Name: "foo"},
 		Endpoints: []string{"endpoint:1", "endpoint:2", "endpoint:3"},
 	}
 	loadBalancer.OnUpdate(endpoints)
@@ -122,7 +122,7 @@ func TestLoadBalanceWorksWithMultipleEndpointsAndUpdates(t *testing.T) {
 	}
 	endpoints := make([]api.Endpoints, 1)
 	endpoints[0] = api.Endpoints{
-		TypeMeta:  api.TypeMeta{ID: "foo"},
+		TypeMeta:  api.TypeMeta{Name: "foo"},
 		Endpoints: []string{"endpoint:1", "endpoint:2", "endpoint:3"},
 	}
 	loadBalancer.OnUpdate(endpoints)
@@ -133,7 +133,7 @@ func TestLoadBalanceWorksWithMultipleEndpointsAndUpdates(t *testing.T) {
 	expectEndpoint(t, loadBalancer, "foo", "endpoint:2")
 	// Then update the configuration with one fewer endpoints, make sure
 	// we start in the beginning again
-	endpoints[0] = api.Endpoints{TypeMeta: api.TypeMeta{ID: "foo"},
+	endpoints[0] = api.Endpoints{TypeMeta: api.TypeMeta{Name: "foo"},
 		Endpoints: []string{"endpoint:8", "endpoint:9"},
 	}
 	loadBalancer.OnUpdate(endpoints)
@@ -142,7 +142,7 @@ func TestLoadBalanceWorksWithMultipleEndpointsAndUpdates(t *testing.T) {
 	expectEndpoint(t, loadBalancer, "foo", "endpoint:8")
 	expectEndpoint(t, loadBalancer, "foo", "endpoint:9")
 	// Clear endpoints
-	endpoints[0] = api.Endpoints{TypeMeta: api.TypeMeta{ID: "foo"}, Endpoints: []string{}}
+	endpoints[0] = api.Endpoints{TypeMeta: api.TypeMeta{Name: "foo"}, Endpoints: []string{}}
 	loadBalancer.OnUpdate(endpoints)
 
 	endpoint, err = loadBalancer.NextEndpoint("foo", nil)
@@ -159,11 +159,11 @@ func TestLoadBalanceWorksWithServiceRemoval(t *testing.T) {
 	}
 	endpoints := make([]api.Endpoints, 2)
 	endpoints[0] = api.Endpoints{
-		TypeMeta:  api.TypeMeta{ID: "foo"},
+		TypeMeta:  api.TypeMeta{Name: "foo"},
 		Endpoints: []string{"endpoint:1", "endpoint:2", "endpoint:3"},
 	}
 	endpoints[1] = api.Endpoints{
-		TypeMeta:  api.TypeMeta{ID: "bar"},
+		TypeMeta:  api.TypeMeta{Name: "bar"},
 		Endpoints: []string{"endpoint:4", "endpoint:5"},
 	}
 	loadBalancer.OnUpdate(endpoints)

pkg/registry/controller/rest.go

@@ -63,13 +63,13 @@ func (rs *REST) Create(ctx api.Context, obj runtime.Object) (<-chan runtime.Obje
 		return nil, errors.NewConflict("controller", controller.Namespace, fmt.Errorf("Controller.Namespace does not match the provided context"))
 	}
 
-	if len(controller.ID) == 0 {
-		controller.ID = uuid.NewUUID().String()
+	if len(controller.Name) == 0 {
+		controller.Name = uuid.NewUUID().String()
 	}
 	// Pod Manifest ID should be assigned by the pod API
 	controller.DesiredState.PodTemplate.DesiredState.Manifest.ID = ""
 	if errs := validation.ValidateReplicationController(controller); len(errs) > 0 {
-		return nil, errors.NewInvalid("replicationController", controller.ID, errs)
+		return nil, errors.NewInvalid("replicationController", controller.Name, errs)
 	}
 
 	controller.CreationTimestamp = util.Now()
@@ -79,7 +79,7 @@ func (rs *REST) Create(ctx api.Context, obj runtime.Object) (<-chan runtime.Obje
 		if err != nil {
 			return nil, err
 		}
-		return rs.registry.GetController(ctx, controller.ID)
+		return rs.registry.GetController(ctx, controller.Name)
 	}), nil
 }
 
@@ -136,14 +136,14 @@ func (rs *REST) Update(ctx api.Context, obj runtime.Object) (<-chan runtime.Obje
 		return nil, errors.NewConflict("controller", controller.Namespace, fmt.Errorf("Controller.Namespace does not match the provided context"))
 	}
 	if errs := validation.ValidateReplicationController(controller); len(errs) > 0 {
-		return nil, errors.NewInvalid("replicationController", controller.ID, errs)
+		return nil, errors.NewInvalid("replicationController", controller.Name, errs)
 	}
 	return apiserver.MakeAsync(func() (runtime.Object, error) {
 		err := rs.registry.UpdateController(ctx, controller)
 		if err != nil {
 			return nil, err
 		}
-		return rs.registry.GetController(ctx, controller.ID)
+		return rs.registry.GetController(ctx, controller.Name)
 	}), nil
 }
 

pkg/registry/controller/rest_test.go

@@ -75,12 +75,12 @@ func TestListControllerList(t *testing.T) {
 			Items: []api.ReplicationController{
 				{
 					TypeMeta: api.TypeMeta{
-						ID: "foo",
+						Name: "foo",
 					},
 				},
 				{
 					TypeMeta: api.TypeMeta{
-						ID: "bar",
+						Name: "bar",
 					},
 				},
 			},
@@ -99,10 +99,10 @@ func TestListControllerList(t *testing.T) {
 	if len(controllers.Items) != 2 {
 		t.Errorf("Unexpected controller list: %#v", controllers)
 	}
-	if controllers.Items[0].ID != "foo" {
+	if controllers.Items[0].Name != "foo" {
 		t.Errorf("Unexpected controller: %#v", controllers.Items[0])
 	}
-	if controllers.Items[1].ID != "bar" {
+	if controllers.Items[1].Name != "bar" {
 		t.Errorf("Unexpected controller: %#v", controllers.Items[1])
 	}
 }
@@ -114,7 +114,7 @@ func TestControllerDecode(t *testing.T) {
 	}
 	controller := &api.ReplicationController{
 		TypeMeta: api.TypeMeta{
-			ID: "foo",
+			Name: "foo",
 		},
 	}
 	body, err := latest.Codec.Encode(controller)
@@ -135,7 +135,7 @@ func TestControllerDecode(t *testing.T) {
 func TestControllerParsing(t *testing.T) {
 	expectedController := api.ReplicationController{
 		TypeMeta: api.TypeMeta{
-			ID: "nginxController",
+			Name: "nginxController",
 		},
 		DesiredState: api.ReplicationControllerState{
 			Replicas: 2,
@@ -225,7 +225,7 @@ func TestCreateController(t *testing.T) {
 		Pods: &api.PodList{
 			Items: []api.Pod{
 				{
-					TypeMeta: api.TypeMeta{ID: "foo"},
+					TypeMeta: api.TypeMeta{Name: "foo"},
 					Labels:   map[string]string{"a": "b"},
 				},
 			},
@@ -237,7 +237,7 @@ func TestCreateController(t *testing.T) {
 		pollPeriod: time.Millisecond * 1,
 	}
 	controller := &api.ReplicationController{
-		TypeMeta: api.TypeMeta{ID: "test"},
+		TypeMeta: api.TypeMeta{Name: "test"},
 		DesiredState: api.ReplicationControllerState{
 			Replicas:        2,
 			ReplicaSelector: map[string]string{"a": "b"},
@@ -270,13 +270,13 @@ func TestControllerStorageValidatesCreate(t *testing.T) {
 	}
 	failureCases := map[string]api.ReplicationController{
 		"empty ID": {
-			TypeMeta: api.TypeMeta{ID: ""},
+			TypeMeta: api.TypeMeta{Name: ""},
 			DesiredState: api.ReplicationControllerState{
 				ReplicaSelector: map[string]string{"bar": "baz"},
 			},
 		},
 		"empty selector": {
-			TypeMeta:     api.TypeMeta{ID: "abc"},
+			TypeMeta:     api.TypeMeta{Name: "abc"},
 			DesiredState: api.ReplicationControllerState{},
 		},
 	}
@@ -301,13 +301,13 @@ func TestControllerStorageValidatesUpdate(t *testing.T) {
 	}
 	failureCases := map[string]api.ReplicationController{
 		"empty ID": {
-			TypeMeta: api.TypeMeta{ID: ""},
+			TypeMeta: api.TypeMeta{Name: ""},
 			DesiredState: api.ReplicationControllerState{
 				ReplicaSelector: map[string]string{"bar": "baz"},
 			},
 		},
 		"empty selector": {
-			TypeMeta:     api.TypeMeta{ID: "abc"},
+			TypeMeta:     api.TypeMeta{Name: "abc"},
 			DesiredState: api.ReplicationControllerState{},
 		},
 	}
@@ -338,8 +338,8 @@ func TestFillCurrentState(t *testing.T) {
 	fakeLister := fakePodLister{
 		l: api.PodList{
 			Items: []api.Pod{
-				{TypeMeta: api.TypeMeta{ID: "foo"}},
-				{TypeMeta: api.TypeMeta{ID: "bar"}},
+				{TypeMeta: api.TypeMeta{Name: "foo"}},
+				{TypeMeta: api.TypeMeta{Name: "bar"}},
 			},
 		},
 	}
@@ -368,7 +368,7 @@ func TestFillCurrentState(t *testing.T) {
 func TestCreateControllerWithConflictingNamespace(t *testing.T) {
 	storage := REST{}
 	controller := &api.ReplicationController{
-		TypeMeta: api.TypeMeta{ID: "test", Namespace: "not-default"},
+		TypeMeta: api.TypeMeta{Name: "test", Namespace: "not-default"},
 	}
 
 	ctx := api.NewDefaultContext()
@@ -386,7 +386,7 @@ func TestCreateControllerWithConflictingNamespace(t *testing.T) {
 func TestUpdateControllerWithConflictingNamespace(t *testing.T) {
 	storage := REST{}
 	controller := &api.ReplicationController{
-		TypeMeta: api.TypeMeta{ID: "test", Namespace: "not-default"},
+		TypeMeta: api.TypeMeta{Name: "test", Namespace: "not-default"},
 	}
 
 	ctx := api.NewDefaultContext()

pkg/registry/endpoint/rest.go

@@ -65,7 +65,7 @@ func (rs *REST) Create(ctx api.Context, obj runtime.Object) (<-chan runtime.Obje
 	if !ok {
 		return nil, fmt.Errorf("not an endpoints: %#v", obj)
 	}
-	if len(endpoints.ID) == 0 {
+	if len(endpoints.Name) == 0 {
 		return nil, fmt.Errorf("id is required: %#v", obj)
 	}
 	endpoints.CreationTimestamp = util.Now()
@@ -74,7 +74,7 @@ func (rs *REST) Create(ctx api.Context, obj runtime.Object) (<-chan runtime.Obje
 		if err != nil {
 			return nil, err
 		}
-		return rs.registry.GetEndpoints(ctx, endpoints.ID)
+		return rs.registry.GetEndpoints(ctx, endpoints.Name)
 	}), nil
 }
 
@@ -89,7 +89,7 @@ func (rs *REST) Update(ctx api.Context, obj runtime.Object) (<-chan runtime.Obje
 		if err != nil {
 			return nil, err
 		}
-		return rs.registry.GetEndpoints(ctx, endpoints.ID)
+		return rs.registry.GetEndpoints(ctx, endpoints.Name)
 	}), nil
 }
 

pkg/registry/endpoint/rest_test.go

@@ -29,7 +29,7 @@ import (
 func TestGetEndpoints(t *testing.T) {
 	registry := &registrytest.ServiceRegistry{
 		Endpoints: api.Endpoints{
-			TypeMeta:  api.TypeMeta{ID: "foo"},
+			TypeMeta:  api.TypeMeta{Name: "foo"},
 			Endpoints: []string{"127.0.0.1:9000"},
 		},
 	}
@@ -59,7 +59,7 @@ func TestGetEndpointsMissingService(t *testing.T) {
 	// returns empty endpoints
 	registry.Err = nil
 	registry.Service = &api.Service{
-		TypeMeta: api.TypeMeta{ID: "foo"},
+		TypeMeta: api.TypeMeta{Name: "foo"},
 	}
 	obj, err := storage.Get(ctx, "foo")
 	if err != nil {
@@ -76,8 +76,8 @@ func TestEndpointsRegistryList(t *testing.T) {
 	registry.EndpointsList = api.EndpointsList{
 		TypeMeta: api.TypeMeta{ResourceVersion: "1"},
 		Items: []api.Endpoints{
-			{TypeMeta: api.TypeMeta{ID: "foo"}},
-			{TypeMeta: api.TypeMeta{ID: "bar"}},
+			{TypeMeta: api.TypeMeta{Name: "foo"}},
+			{TypeMeta: api.TypeMeta{Name: "bar"}},
 		},
 	}
 	ctx := api.NewContext()
@@ -86,10 +86,10 @@ func TestEndpointsRegistryList(t *testing.T) {
 	if len(sl.Items) != 2 {
 		t.Fatalf("Expected 2 endpoints, but got %v", len(sl.Items))
 	}
-	if e, a := "foo", sl.Items[0].ID; e != a {
+	if e, a := "foo", sl.Items[0].Name; e != a {
 		t.Errorf("Expected %v, but got %v", e, a)
 	}
-	if e, a := "bar", sl.Items[1].ID; e != a {
+	if e, a := "bar", sl.Items[1].Name; e != a {
 		t.Errorf("Expected %v, but got %v", e, a)
 	}
 	if sl.ResourceVersion != "1" {

pkg/registry/etcd/etcd.go

@@ -188,12 +188,12 @@ func (r *Registry) CreatePod(ctx api.Context, pod *api.Pod) error {
 	// DesiredState.Host == "" is a signal to the scheduler that this pod needs scheduling.
 	pod.DesiredState.Status = api.PodRunning
 	pod.DesiredState.Host = ""
-	key, err := makePodKey(ctx, pod.ID)
+	key, err := makePodKey(ctx, pod.Name)
 	if err != nil {
 		return err
 	}
 	err = r.CreateObj(key, pod, 0)
-	return etcderr.InterpretCreateError(err, "pod", pod.ID)
+	return etcderr.InterpretCreateError(err, "pod", pod.Name)
 }
 
 // ApplyBinding implements binding's registry
@@ -214,7 +214,7 @@ func (r *Registry) setPodHostTo(ctx api.Context, podID, oldMachine, machine stri
 			return nil, fmt.Errorf("unexpected object: %#v", obj)
 		}
 		if pod.DesiredState.Host != oldMachine {
-			return nil, fmt.Errorf("pod %v is already assigned to host %v", pod.ID, pod.DesiredState.Host)
+			return nil, fmt.Errorf("pod %v is already assigned to host %v", pod.Name, pod.DesiredState.Host)
 		}
 		pod.DesiredState.Host = machine
 		finalPod = pod
@@ -255,7 +255,7 @@ func (r *Registry) assignPod(ctx api.Context, podID string, machine string) erro
 
 func (r *Registry) UpdatePod(ctx api.Context, pod *api.Pod) error {
 	var podOut api.Pod
-	podKey, err := makePodKey(ctx, pod.ID)
+	podKey, err := makePodKey(ctx, pod.Name)
 	if err != nil {
 		return err
 	}
@@ -269,7 +269,7 @@ func (r *Registry) UpdatePod(ctx api.Context, pod *api.Pod) error {
 		// If it's already been scheduled, limit the types of updates we'll accept.
 		errs := validation.ValidatePodUpdate(pod, &podOut)
 		if len(errs) != 0 {
-			return errors.NewInvalid("Pod", pod.ID, errs)
+			return errors.NewInvalid("Pod", pod.Name, errs)
 		}
 	}
 	// There's no race with the scheduler, because either this write will fail because the host
@@ -286,14 +286,14 @@ func (r *Registry) UpdatePod(ctx api.Context, pod *api.Pod) error {
 	return r.AtomicUpdate(containerKey, &api.ContainerManifestList{}, func(in runtime.Object) (runtime.Object, error) {
 		manifests := in.(*api.ContainerManifestList)
 		for ix := range manifests.Items {
-			if manifests.Items[ix].ID == pod.ID {
+			if manifests.Items[ix].ID == pod.Name {
 				manifests.Items[ix] = pod.DesiredState.Manifest
 				return manifests, nil
 			}
 		}
 		// This really shouldn't happen
-		glog.Warningf("Couldn't find: %s in %#v", pod.ID, manifests)
-		return manifests, fmt.Errorf("Failed to update pod, couldn't find %s in %#v", pod.ID, manifests)
+		glog.Warningf("Couldn't find: %s in %#v", pod.Name, manifests)
+		return manifests, fmt.Errorf("Failed to update pod, couldn't find %s in %#v", pod.Name, manifests)
 	})
 }
 
@@ -326,7 +326,7 @@ func (r *Registry) DeletePod(ctx api.Context, podID string) error {
 		newPods := make([]api.BoundPod, 0, len(pods.Items))
 		found := false
 		for _, pod := range pods.Items {
-			if pod.ID != podID {
+			if pod.Name != podID {
 				newPods = append(newPods, pod)
 			} else {
 				found = true
@@ -387,22 +387,22 @@ func (r *Registry) GetController(ctx api.Context, controllerID string) (*api.Rep
 
 // CreateController creates a new ReplicationController.
 func (r *Registry) CreateController(ctx api.Context, controller *api.ReplicationController) error {
-	key, err := makeControllerKey(ctx, controller.ID)
+	key, err := makeControllerKey(ctx, controller.Name)
 	if err != nil {
 		return err
 	}
 	err = r.CreateObj(key, controller, 0)
-	return etcderr.InterpretCreateError(err, "replicationController", controller.ID)
+	return etcderr.InterpretCreateError(err, "replicationController", controller.Name)
 }
 
 // UpdateController replaces an existing ReplicationController.
 func (r *Registry) UpdateController(ctx api.Context, controller *api.ReplicationController) error {
-	key, err := makeControllerKey(ctx, controller.ID)
+	key, err := makeControllerKey(ctx, controller.Name)
 	if err != nil {
 		return err
 	}
 	err = r.SetObj(key, controller)
-	return etcderr.InterpretUpdateError(err, "replicationController", controller.ID)
+	return etcderr.InterpretUpdateError(err, "replicationController", controller.Name)
 }
 
 // DeleteController deletes a ReplicationController specified by its ID.
@@ -434,12 +434,12 @@ func (r *Registry) ListServices(ctx api.Context) (*api.ServiceList, error) {
 
 // CreateService creates a new Service.
 func (r *Registry) CreateService(ctx api.Context, svc *api.Service) error {
-	key, err := makeServiceKey(ctx, svc.ID)
+	key, err := makeServiceKey(ctx, svc.Name)
 	if err != nil {
 		return err
 	}
 	err = r.CreateObj(key, svc, 0)
-	return etcderr.InterpretCreateError(err, "service", svc.ID)
+	return etcderr.InterpretCreateError(err, "service", svc.Name)
 }
 
 // GetService obtains a Service specified by its name.
@@ -505,12 +505,12 @@ func (r *Registry) DeleteService(ctx api.Context, name string) error {
 
 // UpdateService replaces an existing Service.
 func (r *Registry) UpdateService(ctx api.Context, svc *api.Service) error {
-	key, err := makeServiceKey(ctx, svc.ID)
+	key, err := makeServiceKey(ctx, svc.Name)
 	if err != nil {
 		return err
 	}
 	err = r.SetObj(key, svc)
-	return etcderr.InterpretUpdateError(err, "service", svc.ID)
+	return etcderr.InterpretUpdateError(err, "service", svc.Name)
 }
 
 // WatchServices begins watching for new, changed, or deleted service configurations.
@@ -522,7 +522,7 @@ func (r *Registry) WatchServices(ctx api.Context, label, field labels.Selector,
 	if !label.Empty() {
 		return nil, fmt.Errorf("label selectors are not supported on services")
 	}
-	if value, found := field.RequiresExactMatch("ID"); found {
+	if value, found := field.RequiresExactMatch("name"); found {
 		key, err := makeServiceKey(ctx, value)
 		if err != nil {
 			return nil, err
@@ -532,7 +532,7 @@ func (r *Registry) WatchServices(ctx api.Context, label, field labels.Selector,
 	if field.Empty() {
 		return r.WatchList(makeServiceListKey(ctx), version, tools.Everything)
 	}
-	return nil, fmt.Errorf("only the 'ID' and default (everything) field selectors are supported")
+	return nil, fmt.Errorf("only the 'name' and default (everything) field selectors are supported")
 }
 
 // ListEndpoints obtains a list of Services.
@@ -544,8 +544,8 @@ func (r *Registry) ListEndpoints(ctx api.Context) (*api.EndpointsList, error) {
 }
 
 // UpdateEndpoints update Endpoints of a Service.
-func (r *Registry) UpdateEndpoints(ctx api.Context, e *api.Endpoints) error {
-	key, err := makeServiceEndpointsKey(ctx, e.ID)
+func (r *Registry) UpdateEndpoints(ctx api.Context, endpoints *api.Endpoints) error {
+	key, err := makeServiceEndpointsKey(ctx, endpoints.Name)
 	if err != nil {
 		return err
 	}
@@ -553,9 +553,9 @@ func (r *Registry) UpdateEndpoints(ctx api.Context, e *api.Endpoints) error {
 	err = r.AtomicUpdate(key, &api.Endpoints{},
 		func(input runtime.Object) (runtime.Object, error) {
 			// TODO: racy - label query is returning different results for two simultaneous updaters
-			return e, nil
+			return endpoints, nil
 		})
-	return etcderr.InterpretUpdateError(err, "endpoints", e.ID)
+	return etcderr.InterpretUpdateError(err, "endpoints", endpoints.Name)
 }
 
 // WatchEndpoints begins watching for new, changed, or deleted endpoint configurations.
@@ -567,7 +567,7 @@ func (r *Registry) WatchEndpoints(ctx api.Context, label, field labels.Selector,
 	if !label.Empty() {
 		return nil, fmt.Errorf("label selectors are not supported on endpoints")
 	}
-	if value, found := field.RequiresExactMatch("ID"); found {
+	if value, found := field.RequiresExactMatch("name"); found {
 		key, err := makeServiceEndpointsKey(ctx, value)
 		if err != nil {
 			return nil, err
@@ -592,8 +592,8 @@ func (r *Registry) ListMinions(ctx api.Context) (*api.MinionList, error) {
 
 func (r *Registry) CreateMinion(ctx api.Context, minion *api.Minion) error {
 	// TODO: Add some validations.
-	err := r.CreateObj(makeMinionKey(minion.ID), minion, 0)
-	return etcderr.InterpretCreateError(err, "minion", minion.ID)
+	err := r.CreateObj(makeMinionKey(minion.Name), minion, 0)
+	return etcderr.InterpretCreateError(err, "minion", minion.Name)
 }
 
 func (r *Registry) GetMinion(ctx api.Context, minionID string) (*api.Minion, error) {
@@ -601,7 +601,7 @@ func (r *Registry) GetMinion(ctx api.Context, minionID string) (*api.Minion, err
 	key := makeMinionKey(minionID)
 	err := r.ExtractObj(key, &minion, false)
 	if err != nil {
-		return nil, etcderr.InterpretGetError(err, "minion", minion.ID)
+		return nil, etcderr.InterpretGetError(err, "minion", minion.Name)
 	}
 	return &minion, nil
 }

pkg/registry/event/registry_test.go

@@ -42,11 +42,11 @@ func NewTestEventEtcdRegistry(t *testing.T) (*tools.FakeEtcdClient, generic.Regi
 
 func TestEventCreate(t *testing.T) {
 	eventA := &api.Event{
-		TypeMeta: api.TypeMeta{ID: "foo"},
+		TypeMeta: api.TypeMeta{Name: "foo"},
 		Reason:   "forTesting",
 	}
 	eventB := &api.Event{
-		TypeMeta: api.TypeMeta{ID: "foo"},
+		TypeMeta: api.TypeMeta{Name: "foo"},
 		Reason:   "forTesting",
 	}
 

pkg/registry/event/rest.go

@@ -49,11 +49,11 @@ func (rs *REST) Create(ctx api.Context, obj runtime.Object) (<-chan runtime.Obje
 	event.CreationTimestamp = util.Now()
 
 	return apiserver.MakeAsync(func() (runtime.Object, error) {
-		err := rs.registry.Create(ctx, event.ID, event)
+		err := rs.registry.Create(ctx, event.Name, event)
 		if err != nil {
 			return nil, err
 		}
-		return rs.registry.Get(ctx, event.ID)
+		return rs.registry.Get(ctx, event.Name)
 	}), nil
 }
 

pkg/registry/event/rest_test.go

@@ -40,7 +40,7 @@ func NewTestREST() (testRegistry, *REST) {
 func TestRESTCreate(t *testing.T) {
 	_, rest := NewTestREST()
 	eventA := &api.Event{
-		TypeMeta: api.TypeMeta{ID: "foo"},
+		TypeMeta: api.TypeMeta{Name: "foo"},
 		Reason:   "forTesting",
 	}
 	c, err := rest.Create(api.NewContext(), eventA)
@@ -55,7 +55,7 @@ func TestRESTCreate(t *testing.T) {
 func TestRESTDelete(t *testing.T) {
 	_, rest := NewTestREST()
 	eventA := &api.Event{
-		TypeMeta: api.TypeMeta{ID: "foo"},
+		TypeMeta: api.TypeMeta{Name: "foo"},
 		Reason:   "forTesting",
 	}
 	c, err := rest.Create(api.NewContext(), eventA)
@@ -63,7 +63,7 @@ func TestRESTDelete(t *testing.T) {
 		t.Fatalf("Unexpected error %v", err)
 	}
 	<-c
-	c, err = rest.Delete(api.NewContext(), eventA.ID)
+	c, err = rest.Delete(api.NewContext(), eventA.Name)
 	if err != nil {
 		t.Fatalf("Unexpected error %v", err)
 	}
@@ -75,7 +75,7 @@ func TestRESTDelete(t *testing.T) {
 func TestRESTGet(t *testing.T) {
 	_, rest := NewTestREST()
 	eventA := &api.Event{
-		TypeMeta: api.TypeMeta{ID: "foo"},
+		TypeMeta: api.TypeMeta{Name: "foo"},
 		Reason:   "forTesting",
 	}
 	c, err := rest.Create(api.NewContext(), eventA)
@@ -83,7 +83,7 @@ func TestRESTGet(t *testing.T) {
 		t.Fatalf("Unexpected error %v", err)
 	}
 	<-c
-	got, err := rest.Get(api.NewContext(), eventA.ID)
+	got, err := rest.Get(api.NewContext(), eventA.Name)
 	if err != nil {
 		t.Fatalf("Unexpected error %v", err)
 	}
@@ -131,7 +131,7 @@ func TestRESTgetAttrs(t *testing.T) {
 func TestRESTUpdate(t *testing.T) {
 	_, rest := NewTestREST()
 	eventA := &api.Event{
-		TypeMeta: api.TypeMeta{ID: "foo"},
+		TypeMeta: api.TypeMeta{Name: "foo"},
 		Reason:   "forTesting",
 	}
 	c, err := rest.Create(api.NewContext(), eventA)

pkg/registry/generic/etcd/etcd_test.go

@@ -60,7 +60,7 @@ func (sm SetMatcher) Matches(obj runtime.Object) (bool, error) {
 	if !ok {
 		return false, fmt.Errorf("wrong object")
 	}
-	return sm.Has(pod.ID), nil
+	return sm.Has(pod.Name), nil
 }
 
 // EverythingMatcher matches everything
@@ -72,11 +72,11 @@ func (EverythingMatcher) Matches(obj runtime.Object) (bool, error) {
 
 func TestEtcdList(t *testing.T) {
 	podA := &api.Pod{
-		TypeMeta:     api.TypeMeta{ID: "foo"},
+		TypeMeta:     api.TypeMeta{Name: "foo"},
 		DesiredState: api.PodState{Host: "machine"},
 	}
 	podB := &api.Pod{
-		TypeMeta:     api.TypeMeta{ID: "bar"},
+		TypeMeta:     api.TypeMeta{Name: "bar"},
 		DesiredState: api.PodState{Host: "machine"},
 	}
 
@@ -154,11 +154,11 @@ func TestEtcdList(t *testing.T) {
 
 func TestEtcdCreate(t *testing.T) {
 	podA := &api.Pod{
-		TypeMeta:     api.TypeMeta{ID: "foo"},
+		TypeMeta:     api.TypeMeta{Name: "foo"},
 		DesiredState: api.PodState{Host: "machine"},
 	}
 	podB := &api.Pod{
-		TypeMeta:     api.TypeMeta{ID: "foo"},
+		TypeMeta:     api.TypeMeta{Name: "foo"},
 		DesiredState: api.PodState{Host: "machine2"},
 	}
 
@@ -217,11 +217,11 @@ func TestEtcdCreate(t *testing.T) {
 
 func TestEtcdUpdate(t *testing.T) {
 	podA := &api.Pod{
-		TypeMeta:     api.TypeMeta{ID: "foo"},
+		TypeMeta:     api.TypeMeta{Name: "foo"},
 		DesiredState: api.PodState{Host: "machine"},
 	}
 	podB := &api.Pod{
-		TypeMeta:     api.TypeMeta{ID: "foo", ResourceVersion: "1"},
+		TypeMeta:     api.TypeMeta{Name: "foo", ResourceVersion: "1"},
 		DesiredState: api.PodState{Host: "machine2"},
 	}
 
@@ -292,7 +292,7 @@ func TestEtcdUpdate(t *testing.T) {
 
 func TestEtcdGet(t *testing.T) {
 	podA := &api.Pod{
-		TypeMeta:     api.TypeMeta{ID: "foo", ResourceVersion: "1"},
+		TypeMeta:     api.TypeMeta{Name: "foo", ResourceVersion: "1"},
 		DesiredState: api.PodState{Host: "machine"},
 	}
 
@@ -348,7 +348,7 @@ func TestEtcdGet(t *testing.T) {
 
 func TestEtcdDelete(t *testing.T) {
 	podA := &api.Pod{
-		TypeMeta:     api.TypeMeta{ID: "foo", ResourceVersion: "1"},
+		TypeMeta:     api.TypeMeta{Name: "foo", ResourceVersion: "1"},
 		DesiredState: api.PodState{Host: "machine"},
 	}
 
@@ -404,7 +404,7 @@ func TestEtcdDelete(t *testing.T) {
 
 func TestEtcdWatch(t *testing.T) {
 	podA := &api.Pod{
-		TypeMeta:     api.TypeMeta{ID: "foo", ResourceVersion: "1"},
+		TypeMeta:     api.TypeMeta{Name: "foo", ResourceVersion: "1"},
 		DesiredState: api.PodState{Host: "machine"},
 	}
 	respWithPodA := &etcd.Response{

pkg/registry/minion/healthy_registry.go

@@ -73,7 +73,7 @@ func (r *HealthyRegistry) ListMinions(ctx api.Context) (currentMinions *api.Mini
 		return result, err
 	}
 	for _, minion := range list.Items {
-		status, err := health.DoHTTPCheck(r.makeMinionURL(minion.ID), r.client)
+		status, err := health.DoHTTPCheck(r.makeMinionURL(minion.Name), r.client)
 		if err != nil {
 			glog.V(1).Infof("%#v failed health check with error: %s", minion, err)
 			continue

pkg/registry/minion/healthy_registry_test.go

@@ -55,7 +55,7 @@ func TestBasicDelegation(t *testing.T) {
 		t.Errorf("Expected %v, Got %v", mockMinionRegistry.Minions, list)
 	}
 	err = healthy.CreateMinion(ctx, &api.Minion{
-		TypeMeta: api.TypeMeta{ID: "foo"},
+		TypeMeta: api.TypeMeta{Name: "foo"},
 	})
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)

pkg/registry/minion/rest.go

@@ -50,7 +50,7 @@ func (rs *REST) Create(ctx api.Context, obj runtime.Object) (<-chan runtime.Obje
 	if !ok {
 		return nil, fmt.Errorf("not a minion: %#v", obj)
 	}
-	if minion.ID == "" {
+	if minion.Name == "" {
 		return nil, fmt.Errorf("ID should not be empty: %#v", minion)
 	}
 
@@ -61,7 +61,7 @@ func (rs *REST) Create(ctx api.Context, obj runtime.Object) (<-chan runtime.Obje
 		if err != nil {
 			return nil, err
 		}
-		minion, err := rs.registry.GetMinion(ctx, minion.ID)
+		minion, err := rs.registry.GetMinion(ctx, minion.Name)
 		if minion == nil {
 			return nil, ErrDoesNotExist
 		}
@@ -106,7 +106,7 @@ func (rs *REST) Update(ctx api.Context, minion runtime.Object) (<-chan runtime.O
 }
 
 func (rs *REST) toApiMinion(name string) *api.Minion {
-	return &api.Minion{TypeMeta: api.TypeMeta{ID: name}}
+	return &api.Minion{TypeMeta: api.TypeMeta{Name: name}}
 }
 
 // ResourceLocation returns a URL to which one can send traffic for the specified minion.
@@ -117,7 +117,7 @@ func (rs *REST) ResourceLocation(ctx api.Context, id string) (string, error) {
 	}
 	host := minion.HostIP
 	if host == "" {
-		host = minion.ID
+		host = minion.Name
 	}
 	// TODO: Minion webservers should be secure!
 	return "http://" + net.JoinHostPort(host, strconv.Itoa(ports.KubeletPort)), nil

pkg/registry/minion/rest_test.go

@@ -27,25 +27,25 @@ import (
 func TestMinionREST(t *testing.T) {
 	ms := NewREST(registrytest.NewMinionRegistry([]string{"foo", "bar"}, api.NodeResources{}))
 	ctx := api.NewContext()
-	if obj, err := ms.Get(ctx, "foo"); err != nil || obj.(*api.Minion).ID != "foo" {
+	if obj, err := ms.Get(ctx, "foo"); err != nil || obj.(*api.Minion).Name != "foo" {
 		t.Errorf("missing expected object")
 	}
-	if obj, err := ms.Get(ctx, "bar"); err != nil || obj.(*api.Minion).ID != "bar" {
+	if obj, err := ms.Get(ctx, "bar"); err != nil || obj.(*api.Minion).Name != "bar" {
 		t.Errorf("missing expected object")
 	}
 	if _, err := ms.Get(ctx, "baz"); err != ErrDoesNotExist {
 		t.Errorf("has unexpected object")
 	}
 
-	c, err := ms.Create(ctx, &api.Minion{TypeMeta: api.TypeMeta{ID: "baz"}})
+	c, err := ms.Create(ctx, &api.Minion{TypeMeta: api.TypeMeta{Name: "baz"}})
 	if err != nil {
 		t.Errorf("insert failed")
 	}
 	obj := <-c
-	if m, ok := obj.(*api.Minion); !ok || m.ID != "baz" {
+	if m, ok := obj.(*api.Minion); !ok || m.Name != "baz" {
 		t.Errorf("insert return value was weird: %#v", obj)
 	}
-	if obj, err := ms.Get(ctx, "baz"); err != nil || obj.(*api.Minion).ID != "baz" {
+	if obj, err := ms.Get(ctx, "baz"); err != nil || obj.(*api.Minion).Name != "baz" {
 		t.Errorf("insert didn't actually insert")
 	}
 
@@ -72,9 +72,9 @@ func TestMinionREST(t *testing.T) {
 	}
 	expect := []api.Minion{
 		{
-			TypeMeta: api.TypeMeta{ID: "foo"},
+			TypeMeta: api.TypeMeta{Name: "foo"},
 		}, {
-			TypeMeta: api.TypeMeta{ID: "baz"},
+			TypeMeta: api.TypeMeta{Name: "baz"},
 		},
 	}
 	nodeList := list.(*api.MinionList)
@@ -85,7 +85,7 @@ func TestMinionREST(t *testing.T) {
 
 func contains(nodes *api.MinionList, nodeID string) bool {
 	for _, node := range nodes.Items {
-		if node.ID == nodeID {
+		if node.Name == nodeID {
 			return true
 		}
 	}

pkg/registry/pod/bound_pod_factory_test.go

@@ -32,7 +32,7 @@ func TestMakeBoundPodNoServices(t *testing.T) {
 	}
 
 	pod, err := factory.MakeBoundPod("machine", &api.Pod{
-		TypeMeta: api.TypeMeta{ID: "foobar"},
+		TypeMeta: api.TypeMeta{Name: "foobar"},
 		DesiredState: api.PodState{
 			Manifest: api.ContainerManifest{
 				Containers: []api.Container{
@@ -51,8 +51,8 @@ func TestMakeBoundPodNoServices(t *testing.T) {
 	if len(container.Env) != 0 {
 		t.Errorf("Expected zero env vars, got: %#v", pod)
 	}
-	if pod.ID != "foobar" {
-		t.Errorf("Failed to assign ID to pod: %#v", pod.ID)
+	if pod.Name != "foobar" {
+		t.Errorf("Failed to assign ID to pod: %#v", pod.Name)
 	}
 }
 
@@ -61,7 +61,7 @@ func TestMakeBoundPodServices(t *testing.T) {
 		List: api.ServiceList{
 			Items: []api.Service{
 				{
-					TypeMeta: api.TypeMeta{ID: "test"},
+					TypeMeta: api.TypeMeta{Name: "test"},
 					Port:     8080,
 					ContainerPort: util.IntOrString{
 						Kind:   util.IntstrInt,
@@ -137,7 +137,7 @@ func TestMakeBoundPodServicesExistingEnvVar(t *testing.T) {
 		List: api.ServiceList{
 			Items: []api.Service{
 				{
-					TypeMeta: api.TypeMeta{ID: "test"},
+					TypeMeta: api.TypeMeta{Name: "test"},
 					Port:     8080,
 					ContainerPort: util.IntOrString{
 						Kind:   util.IntstrInt,

pkg/registry/pod/rest.go

@@ -94,12 +94,12 @@ func (rs *REST) Create(ctx api.Context, obj runtime.Object) (<-chan runtime.Obje
 		return nil, errors.NewConflict("pod", pod.Namespace, fmt.Errorf("Pod.Namespace does not match the provided context"))
 	}
 	pod.DesiredState.Manifest.UUID = uuid.NewUUID().String()
-	if len(pod.ID) == 0 {
-		pod.ID = pod.DesiredState.Manifest.UUID
+	if len(pod.Name) == 0 {
+		pod.Name = pod.DesiredState.Manifest.UUID
 	}
-	pod.DesiredState.Manifest.ID = pod.ID
+	pod.DesiredState.Manifest.ID = pod.Name
 	if errs := validation.ValidatePod(pod); len(errs) > 0 {
-		return nil, errors.NewInvalid("pod", pod.ID, errs)
+		return nil, errors.NewInvalid("pod", pod.Name, errs)
 	}
 	pod.CreationTimestamp = util.Now()
 
@@ -107,7 +107,7 @@ func (rs *REST) Create(ctx api.Context, obj runtime.Object) (<-chan runtime.Obje
 		if err := rs.registry.CreatePod(ctx, pod); err != nil {
 			return nil, err
 		}
-		return rs.registry.GetPod(ctx, pod.ID)
+		return rs.registry.GetPod(ctx, pod.Name)
 	}), nil
 }
 
@@ -141,7 +141,7 @@ func (rs *REST) Get(ctx api.Context, id string) (runtime.Object, error) {
 
 func (rs *REST) podToSelectableFields(pod *api.Pod) labels.Set {
 	return labels.Set{
-		"ID": pod.ID,
+		"name":                pod.Name,
 		"DesiredState.Status": string(pod.DesiredState.Status),
 		"DesiredState.Host":   pod.DesiredState.Host,
 	}
@@ -190,13 +190,13 @@ func (rs *REST) Update(ctx api.Context, obj runtime.Object) (<-chan runtime.Obje
 		return nil, errors.NewConflict("pod", pod.Namespace, fmt.Errorf("Pod.Namespace does not match the provided context"))
 	}
 	if errs := validation.ValidatePod(pod); len(errs) > 0 {
-		return nil, errors.NewInvalid("pod", pod.ID, errs)
+		return nil, errors.NewInvalid("pod", pod.Name, errs)
 	}
 	return apiserver.MakeAsync(func() (runtime.Object, error) {
 		if err := rs.registry.UpdatePod(ctx, pod); err != nil {
 			return nil, err
 		}
-		return rs.registry.GetPod(ctx, pod.ID)
+		return rs.registry.GetPod(ctx, pod.Name)
 	}), nil
 }
 
@@ -208,13 +208,13 @@ func (rs *REST) fillPodInfo(pod *api.Pod) {
 	// Get cached info for the list currently.
 	// TODO: Optionally use fresh info
 	if rs.podCache != nil {
-		info, err := rs.podCache.GetPodInfo(pod.CurrentState.Host, pod.Namespace, pod.ID)
+		info, err := rs.podCache.GetPodInfo(pod.CurrentState.Host, pod.Namespace, pod.Name)
 		if err != nil {
 			if err != client.ErrPodInfoNotAvailable {
 				glog.Errorf("Error getting container info from cache: %#v", err)
 			}
 			if rs.podInfoGetter != nil {
-				info, err = rs.podInfoGetter.GetPodInfo(pod.CurrentState.Host, pod.Namespace, pod.ID)
+				info, err = rs.podInfoGetter.GetPodInfo(pod.CurrentState.Host, pod.Namespace, pod.Name)
 			}
 			if err != nil {
 				if err != client.ErrPodInfoNotAvailable {
@@ -232,7 +232,7 @@ func (rs *REST) fillPodInfo(pod *api.Pod) {
 				glog.Warningf("No network settings: %#v", netContainerInfo)
 			}
 		} else {
-			glog.Warningf("Couldn't find network container for %s in %v", pod.ID, info)
+			glog.Warningf("Couldn't find network container for %s in %v", pod.Name, info)
 		}
 	}
 }
@@ -280,7 +280,7 @@ func getPodStatus(pod *api.Pod, minions client.MinionInterface) (api.PodStatus,
 		}
 		found := false
 		for _, minion := range res.Items {
-			if minion.ID == pod.CurrentState.Host {
+			if minion.Name == pod.CurrentState.Host {
 				found = true
 				break
 			}

pkg/registry/pod/rest_test.go

@@ -95,10 +95,10 @@ func TestCreatePodSetsIds(t *testing.T) {
 	}
 	expectApiStatusError(t, ch, podRegistry.Err.Error())
 
-	if len(podRegistry.Pod.ID) == 0 {
+	if len(podRegistry.Pod.Name) == 0 {
 		t.Errorf("Expected pod ID to be set, Got %#v", pod)
 	}
-	if podRegistry.Pod.DesiredState.Manifest.ID != podRegistry.Pod.ID {
+	if podRegistry.Pod.DesiredState.Manifest.ID != podRegistry.Pod.Name {
 		t.Errorf("Expected manifest ID to be equal to pod ID, Got %#v", pod)
 	}
 }
@@ -176,12 +176,12 @@ func TestListPodList(t *testing.T) {
 		Items: []api.Pod{
 			{
 				TypeMeta: api.TypeMeta{
-					ID: "foo",
+					Name: "foo",
 				},
 			},
 			{
 				TypeMeta: api.TypeMeta{
-					ID: "bar",
+					Name: "bar",
 				},
 			},
 		},
@@ -201,10 +201,10 @@ func TestListPodList(t *testing.T) {
 	if len(pods.Items) != 2 {
 		t.Errorf("Unexpected pod list: %#v", pods)
 	}
-	if pods.Items[0].ID != "foo" {
+	if pods.Items[0].Name != "foo" {
 		t.Errorf("Unexpected pod: %#v", pods.Items[0])
 	}
-	if pods.Items[1].ID != "bar" {
+	if pods.Items[1].Name != "bar" {
 		t.Errorf("Unexpected pod: %#v", pods.Items[1])
 	}
 }
@@ -214,18 +214,18 @@ func TestListPodListSelection(t *testing.T) {
 	podRegistry.Pods = &api.PodList{
 		Items: []api.Pod{
 			{
-				TypeMeta: api.TypeMeta{ID: "foo"},
+				TypeMeta: api.TypeMeta{Name: "foo"},
 			}, {
-				TypeMeta:     api.TypeMeta{ID: "bar"},
+				TypeMeta:     api.TypeMeta{Name: "bar"},
 				DesiredState: api.PodState{Host: "barhost"},
 			}, {
-				TypeMeta:     api.TypeMeta{ID: "baz"},
+				TypeMeta:     api.TypeMeta{Name: "baz"},
 				DesiredState: api.PodState{Status: "bazstatus"},
 			}, {
-				TypeMeta: api.TypeMeta{ID: "qux"},
+				TypeMeta: api.TypeMeta{Name: "qux"},
 				Labels:   map[string]string{"label": "qux"},
 			}, {
-				TypeMeta: api.TypeMeta{ID: "zot"},
+				TypeMeta: api.TypeMeta{Name: "zot"},
 			},
 		},
 	}
@@ -243,7 +243,7 @@ func TestListPodListSelection(t *testing.T) {
 		{
 			expectedIDs: util.NewStringSet("foo", "bar", "baz", "qux", "zot"),
 		}, {
-			field:       "ID=zot",
+			field:       "name=zot",
 			expectedIDs: util.NewStringSet("zot"),
 		}, {
 			label:       "label=qux",
@@ -284,10 +284,10 @@ func TestListPodListSelection(t *testing.T) {
 			t.Errorf("%v: Expected %v, got %v", index, e, a)
 		}
 		for _, pod := range pods.Items {
-			if !item.expectedIDs.Has(pod.ID) {
-				t.Errorf("%v: Unexpected pod %v", index, pod.ID)
+			if !item.expectedIDs.Has(pod.Name) {
+				t.Errorf("%v: Unexpected pod %v", index, pod.Name)
 			}
-			t.Logf("%v: Got pod ID: %v", index, pod.ID)
+			t.Logf("%v: Got pod Name: %v", index, pod.Name)
 		}
 	}
 }
@@ -299,7 +299,7 @@ func TestPodDecode(t *testing.T) {
 	}
 	expected := &api.Pod{
 		TypeMeta: api.TypeMeta{
-			ID: "foo",
+			Name: "foo",
 		},
 	}
 	body, err := latest.Codec.Encode(expected)
@@ -319,7 +319,7 @@ func TestPodDecode(t *testing.T) {
 
 func TestGetPod(t *testing.T) {
 	podRegistry := registrytest.NewPodRegistry(nil)
-	podRegistry.Pod = &api.Pod{TypeMeta: api.TypeMeta{ID: "foo"}}
+	podRegistry.Pod = &api.Pod{TypeMeta: api.TypeMeta{Name: "foo"}}
 	storage := REST{
 		registry: podRegistry,
 		ipCache:  ipCache{},
@@ -340,7 +340,7 @@ func TestGetPod(t *testing.T) {
 func TestGetPodCloud(t *testing.T) {
 	fakeCloud := &fake_cloud.FakeCloud{}
 	podRegistry := registrytest.NewPodRegistry(nil)
-	podRegistry.Pod = &api.Pod{TypeMeta: api.TypeMeta{ID: "foo"}, CurrentState: api.PodState{Host: "machine"}}
+	podRegistry.Pod = &api.Pod{TypeMeta: api.TypeMeta{Name: "foo"}, CurrentState: api.PodState{Host: "machine"}}
 
 	clock := &fakeClock{t: time.Now()}
 
@@ -386,7 +386,7 @@ func TestMakePodStatus(t *testing.T) {
 		Minions: api.MinionList{
 			Items: []api.Minion{
 				{
-					TypeMeta: api.TypeMeta{ID: "machine"},
+					TypeMeta: api.TypeMeta{Name: "machine"},
 				},
 			},
 		},
@@ -561,7 +561,7 @@ func TestPodStorageValidatesUpdate(t *testing.T) {
 func TestCreatePod(t *testing.T) {
 	podRegistry := registrytest.NewPodRegistry(nil)
 	podRegistry.Pod = &api.Pod{
-		TypeMeta: api.TypeMeta{ID: "foo"},
+		TypeMeta: api.TypeMeta{Name: "foo"},
 		CurrentState: api.PodState{
 			Host: "machine",
 		},
@@ -576,7 +576,7 @@ func TestCreatePod(t *testing.T) {
 		},
 	}
 	pod := &api.Pod{
-		TypeMeta:     api.TypeMeta{ID: "foo"},
+		TypeMeta:     api.TypeMeta{Name: "foo"},
 		DesiredState: desiredState,
 	}
 	ctx := api.NewDefaultContext()
@@ -656,7 +656,7 @@ func TestFillPodInfoNoData(t *testing.T) {
 func TestCreatePodWithConflictingNamespace(t *testing.T) {
 	storage := REST{}
 	pod := &api.Pod{
-		TypeMeta: api.TypeMeta{ID: "test", Namespace: "not-default"},
+		TypeMeta: api.TypeMeta{Name: "test", Namespace: "not-default"},
 	}
 
 	ctx := api.NewDefaultContext()
@@ -674,7 +674,7 @@ func TestCreatePodWithConflictingNamespace(t *testing.T) {
 func TestUpdatePodWithConflictingNamespace(t *testing.T) {
 	storage := REST{}
 	pod := &api.Pod{
-		TypeMeta: api.TypeMeta{ID: "test", Namespace: "not-default"},
+		TypeMeta: api.TypeMeta{Name: "test", Namespace: "not-default"},
 	}
 
 	ctx := api.NewDefaultContext()

pkg/registry/registrytest/minion.go

@@ -34,7 +34,7 @@ func MakeMinionList(minions []string, nodeResources api.NodeResources) *api.Mini
 		Items: make([]api.Minion, len(minions)),
 	}
 	for i := range minions {
-		list.Items[i].ID = minions[i]
+		list.Items[i].Name = minions[i]
 		list.Items[i].NodeResources = nodeResources
 	}
 	return &list
@@ -55,7 +55,7 @@ func (r *MinionRegistry) ListMinions(ctx api.Context) (*api.MinionList, error) {
 func (r *MinionRegistry) CreateMinion(ctx api.Context, minion *api.Minion) error {
 	r.Lock()
 	defer r.Unlock()
-	r.Minion = minion.ID
+	r.Minion = minion.Name
 	r.Minions.Items = append(r.Minions.Items, *minion)
 	return r.Err
 }
@@ -64,7 +64,7 @@ func (r *MinionRegistry) GetMinion(ctx api.Context, minionID string) (*api.Minio
 	r.Lock()
 	defer r.Unlock()
 	for _, node := range r.Minions.Items {
-		if node.ID == minionID {
+		if node.Name == minionID {
 			return &node, r.Err
 		}
 	}
@@ -76,8 +76,8 @@ func (r *MinionRegistry) DeleteMinion(ctx api.Context, minionID string) error {
 	defer r.Unlock()
 	var newList []api.Minion
 	for _, node := range r.Minions.Items {
-		if node.ID != minionID {
-			newList = append(newList, api.Minion{TypeMeta: api.TypeMeta{ID: node.ID}})
+		if node.Name != minionID {
+			newList = append(newList, api.Minion{TypeMeta: api.TypeMeta{Name: node.Name}})
 		}
 	}
 	r.Minions.Items = newList

pkg/registry/registrytest/service.go

@@ -82,7 +82,7 @@ func (r *ServiceRegistry) UpdateService(ctx api.Context, svc *api.Service) error
 	r.mu.Lock()
 	defer r.mu.Unlock()
 
-	r.UpdatedID = svc.ID
+	r.UpdatedID = svc.Name
 	r.Service = svc
 	return r.Err
 }

pkg/registry/service/rest.go

@@ -67,40 +67,40 @@ func reloadIPsFromStorage(ipa *ipAllocator, registry Registry) {
 		return
 	}
 	for i := range services.Items {
-		s := &services.Items[i]
-		if s.PortalIP == "" {
-			glog.Warningf("service %q has no PortalIP", s.ID)
+		service := &services.Items[i]
+		if service.PortalIP == "" {
+			glog.Warningf("service %q has no PortalIP", service.Name)
 			continue
 		}
-		if err := ipa.Allocate(net.ParseIP(s.PortalIP)); err != nil {
+		if err := ipa.Allocate(net.ParseIP(service.PortalIP)); err != nil {
 			// This is really bad.
-			glog.Errorf("service %q PortalIP %s could not be allocated: %s", s.ID, s.PortalIP, err)
+			glog.Errorf("service %q PortalIP %s could not be allocated: %s", service.Name, service.PortalIP, err)
 		}
 	}
 }
 
 func (rs *REST) Create(ctx api.Context, obj runtime.Object) (<-chan runtime.Object, error) {
-	srv := obj.(*api.Service)
-	if !api.ValidNamespace(ctx, &srv.TypeMeta) {
-		return nil, errors.NewConflict("service", srv.Namespace, fmt.Errorf("Service.Namespace does not match the provided context"))
+	service := obj.(*api.Service)
+	if !api.ValidNamespace(ctx, &service.TypeMeta) {
+		return nil, errors.NewConflict("service", service.Namespace, fmt.Errorf("Service.Namespace does not match the provided context"))
 	}
-	if errs := validation.ValidateService(srv); len(errs) > 0 {
-		return nil, errors.NewInvalid("service", srv.ID, errs)
+	if errs := validation.ValidateService(service); len(errs) > 0 {
+		return nil, errors.NewInvalid("service", service.Name, errs)
 	}
 
-	srv.CreationTimestamp = util.Now()
+	service.CreationTimestamp = util.Now()
 
 	if ip, err := rs.portalMgr.AllocateNext(); err != nil {
 		return nil, err
 	} else {
-		srv.PortalIP = ip.String()
+		service.PortalIP = ip.String()
 	}
 
 	return apiserver.MakeAsync(func() (runtime.Object, error) {
 		// TODO: Consider moving this to a rectification loop, so that we make/remove external load balancers
 		// correctly no matter what http operations happen.
-		srv.ProxyPort = 0
-		if srv.CreateExternalLoadBalancer {
+		service.ProxyPort = 0
+		if service.CreateExternalLoadBalancer {
 			if rs.cloud == nil {
 				return nil, fmt.Errorf("requested an external service, but no cloud provider supplied.")
 			}
@@ -120,26 +120,26 @@ func (rs *REST) Create(ctx api.Context, obj runtime.Object) (<-chan runtime.Obje
 			if err != nil {
 				return nil, err
 			}
-			err = balancer.CreateTCPLoadBalancer(srv.ID, zone.Region, srv.Port, hostsFromMinionList(hosts))
+			err = balancer.CreateTCPLoadBalancer(service.Name, zone.Region, service.Port, hostsFromMinionList(hosts))
 			if err != nil {
 				return nil, err
 			}
 			// External load-balancers require a known port for the service proxy.
 			// TODO: If we end up brokering HostPorts between Pods and Services, this can be any port.
-			srv.ProxyPort = srv.Port
+			service.ProxyPort = service.Port
 		}
-		err := rs.registry.CreateService(ctx, srv)
+		err := rs.registry.CreateService(ctx, service)
 		if err != nil {
 			return nil, err
 		}
-		return rs.registry.GetService(ctx, srv.ID)
+		return rs.registry.GetService(ctx, service.Name)
 	}), nil
 }
 
 func hostsFromMinionList(list *api.MinionList) []string {
 	result := make([]string, len(list.Items))
 	for ix := range list.Items {
-		result[ix] = list.Items[ix].ID
+		result[ix] = list.Items[ix].Name
 	}
 	return result
 }
@@ -157,11 +157,11 @@ func (rs *REST) Delete(ctx api.Context, id string) (<-chan runtime.Object, error
 }
 
 func (rs *REST) Get(ctx api.Context, id string) (runtime.Object, error) {
-	s, err := rs.registry.GetService(ctx, id)
+	service, err := rs.registry.GetService(ctx, id)
 	if err != nil {
 		return nil, err
 	}
-	return s, err
+	return service, err
 }
 
 // TODO: implement field selector?
@@ -200,10 +200,10 @@ func GetServiceEnvironmentVariables(ctx api.Context, registry Registry, machine
 	}
 	for _, service := range services.Items {
 		// Host
-		name := makeEnvVariableName(service.ID) + "_SERVICE_HOST"
+		name := makeEnvVariableName(service.Name) + "_SERVICE_HOST"
 		result = append(result, api.EnvVar{Name: name, Value: service.PortalIP})
 		// Port
-		name = makeEnvVariableName(service.ID) + "_SERVICE_PORT"
+		name = makeEnvVariableName(service.Name) + "_SERVICE_PORT"
 		result = append(result, api.EnvVar{Name: name, Value: strconv.Itoa(service.Port)})
 		// Docker-compatible vars.
 		result = append(result, makeLinkVariables(service)...)
@@ -212,27 +212,27 @@ func GetServiceEnvironmentVariables(ctx api.Context, registry Registry, machine
 }
 
 func (rs *REST) Update(ctx api.Context, obj runtime.Object) (<-chan runtime.Object, error) {
-	srv := obj.(*api.Service)
-	if !api.ValidNamespace(ctx, &srv.TypeMeta) {
-		return nil, errors.NewConflict("service", srv.Namespace, fmt.Errorf("Service.Namespace does not match the provided context"))
+	service := obj.(*api.Service)
+	if !api.ValidNamespace(ctx, &service.TypeMeta) {
+		return nil, errors.NewConflict("service", service.Namespace, fmt.Errorf("Service.Namespace does not match the provided context"))
 	}
-	if errs := validation.ValidateService(srv); len(errs) > 0 {
-		return nil, errors.NewInvalid("service", srv.ID, errs)
+	if errs := validation.ValidateService(service); len(errs) > 0 {
+		return nil, errors.NewInvalid("service", service.Name, errs)
 	}
 	return apiserver.MakeAsync(func() (runtime.Object, error) {
-		cur, err := rs.registry.GetService(ctx, srv.ID)
+		cur, err := rs.registry.GetService(ctx, service.Name)
 		if err != nil {
 			return nil, err
 		}
 		// Copy over non-user fields.
-		srv.PortalIP = cur.PortalIP
-		srv.ProxyPort = cur.ProxyPort
+		service.PortalIP = cur.PortalIP
+		service.ProxyPort = cur.ProxyPort
 		// TODO: check to see if external load balancer status changed
-		err = rs.registry.UpdateService(ctx, srv)
+		err = rs.registry.UpdateService(ctx, service)
 		if err != nil {
 			return nil, err
 		}
-		return rs.registry.GetService(ctx, srv.ID)
+		return rs.registry.GetService(ctx, service.Name)
 	}), nil
 }
 
@@ -270,7 +270,7 @@ func (rs *REST) deleteExternalLoadBalancer(service *api.Service) error {
 	if err != nil {
 		return err
 	}
-	if err := balancer.DeleteTCPLoadBalancer(service.TypeMeta.ID, zone.Region); err != nil {
+	if err := balancer.DeleteTCPLoadBalancer(service.Name, zone.Region); err != nil {
 		return err
 	}
 	return nil
@@ -281,7 +281,7 @@ func makeEnvVariableName(str string) string {
 }
 
 func makeLinkVariables(service api.Service) []api.EnvVar {
-	prefix := makeEnvVariableName(service.ID)
+	prefix := makeEnvVariableName(service.Name)
 	protocol := string(api.ProtocolTCP)
 	if service.Protocol != "" {
 		protocol = string(service.Protocol)

pkg/runtime/embedded_test.go

@@ -48,10 +48,10 @@ func TestEmbeddedObject(t *testing.T) {
 	s.AddKnownTypeWithName("v1test", "EmbeddedTest", &EmbeddedTestExternal{})
 
 	outer := &EmbeddedTest{
-		TypeMeta: runtime.TypeMeta{ID: "outer"},
+		TypeMeta: runtime.TypeMeta{Name: "outer"},
 		Object: runtime.EmbeddedObject{
 			&EmbeddedTest{
-				TypeMeta: runtime.TypeMeta{ID: "inner"},
+				TypeMeta: runtime.TypeMeta{Name: "inner"},
 			},
 		},
 	}
@@ -79,7 +79,7 @@ func TestEmbeddedObject(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Unexpected decode error %v", err)
 	}
-	if externalViaJSON.Kind == "" || externalViaJSON.APIVersion == "" || externalViaJSON.ID != "outer" {
+	if externalViaJSON.Kind == "" || externalViaJSON.APIVersion == "" || externalViaJSON.Name != "outer" {
 		t.Errorf("Expected objects to have type info set, got %#v", externalViaJSON)
 	}
 	if !reflect.DeepEqual(externalViaJSON.EmptyObject.RawJSON, []byte("null")) || len(externalViaJSON.Object.RawJSON) == 0 {

pkg/runtime/helper_test.go

@@ -29,9 +29,9 @@ import (
 func TestExtractList(t *testing.T) {
 	pl := &api.PodList{
 		Items: []api.Pod{
-			{TypeMeta: api.TypeMeta{ID: "1"}},
-			{TypeMeta: api.TypeMeta{ID: "2"}},
-			{TypeMeta: api.TypeMeta{ID: "3"}},
+			{TypeMeta: api.TypeMeta{Name: "1"}},
+			{TypeMeta: api.TypeMeta{Name: "2"}},
+			{TypeMeta: api.TypeMeta{Name: "3"}},
 		},
 	}
 	list, err := runtime.ExtractList(pl)
@@ -42,7 +42,7 @@ func TestExtractList(t *testing.T) {
 		t.Fatalf("Expected %v, got %v", e, a)
 	}
 	for i := range list {
-		if e, a := list[i].(*api.Pod).ID, pl.Items[i].ID; e != a {
+		if e, a := list[i].(*api.Pod).Name, pl.Items[i].Name; e != a {
 			t.Fatalf("Expected %v, got %v", e, a)
 		}
 	}
@@ -51,9 +51,9 @@ func TestExtractList(t *testing.T) {
 func TestSetList(t *testing.T) {
 	pl := &api.PodList{}
 	list := []runtime.Object{
-		&api.Pod{TypeMeta: api.TypeMeta{ID: "1"}},
-		&api.Pod{TypeMeta: api.TypeMeta{ID: "2"}},
-		&api.Pod{TypeMeta: api.TypeMeta{ID: "3"}},
+		&api.Pod{TypeMeta: api.TypeMeta{Name: "1"}},
+		&api.Pod{TypeMeta: api.TypeMeta{Name: "2"}},
+		&api.Pod{TypeMeta: api.TypeMeta{Name: "3"}},
 	}
 	err := runtime.SetList(pl, list)
 	if err != nil {
@@ -63,7 +63,7 @@ func TestSetList(t *testing.T) {
 		t.Fatalf("Expected %v, got %v", e, a)
 	}
 	for i := range list {
-		if e, a := list[i].(*api.Pod).ID, pl.Items[i].ID; e != a {
+		if e, a := list[i].(*api.Pod).Name, pl.Items[i].Name; e != a {
 			t.Fatalf("Expected %v, got %v", e, a)
 		}
 	}

pkg/runtime/typemeta.go

@@ -195,7 +195,7 @@ func fieldPtr(v reflect.Value, fieldName string, dest interface{}) error {
 // Returns an error if this isn't the case.
 func newGenericTypeMeta(v reflect.Value) (genericTypeMeta, error) {
 	g := genericTypeMeta{}
-	if err := fieldPtr(v, "ID", &g.id); err != nil {
+	if err := fieldPtr(v, "Name", &g.id); err != nil {
 		return g, err
 	}
 	if err := fieldPtr(v, "APIVersion", &g.apiVersion); err != nil {

pkg/runtime/typemeta_test.go

@@ -26,14 +26,14 @@ import (
 func TestGenericTypeMeta(t *testing.T) {
 	type TypeMeta struct {
 		Kind              string    `json:"kind,omitempty" yaml:"kind,omitempty"`
-		ID                string    `json:"id,omitempty" yaml:"id,omitempty"`
+		Name              string    `json:"name,omitempty" yaml:"name,omitempty"`
 		CreationTimestamp util.Time `json:"creationTimestamp,omitempty" yaml:"creationTimestamp,omitempty"`
 		SelfLink          string    `json:"selfLink,omitempty" yaml:"selfLink,omitempty"`
 		ResourceVersion   string    `json:"resourceVersion,omitempty" yaml:"resourceVersion,omitempty"`
 		APIVersion        string    `json:"apiVersion,omitempty" yaml:"apiVersion,omitempty"`
 	}
 	j := TypeMeta{
-		ID:              "foo",
+		Name:            "foo",
 		APIVersion:      "a",
 		Kind:            "b",
 		ResourceVersion: "1",
@@ -68,7 +68,7 @@ func TestGenericTypeMeta(t *testing.T) {
 	jbi.SetSelfLink("google.com")
 
 	// Prove that jbi changes the original object.
-	if e, a := "bar", j.ID; e != a {
+	if e, a := "bar", j.Name; e != a {
 		t.Errorf("expected %v, got %v", e, a)
 	}
 	if e, a := "c", j.APIVersion; e != a {

pkg/runtime/types.go

@@ -36,7 +36,7 @@ import (
 //
 type TypeMeta struct {
 	Kind              string    `json:"kind,omitempty" yaml:"kind,omitempty"`
-	ID                string    `json:"id,omitempty" yaml:"id,omitempty"`
+	Name              string    `json:"name,omitempty" yaml:"name,omitempty"`
 	CreationTimestamp util.Time `json:"creationTimestamp,omitempty" yaml:"creationTimestamp,omitempty"`
 	SelfLink          string    `json:"selfLink,omitempty" yaml:"selfLink,omitempty"`
 	ResourceVersion   string    `json:"resourceVersion,omitempty" yaml:"resourceVersion,omitempty"`

pkg/scheduler/generic_scheduler.go

@@ -72,7 +72,7 @@ func findNodesThatFit(pod api.Pod, podLister PodLister, predicates []FitPredicat
 	for _, node := range nodes.Items {
 		fits := true
 		for _, predicate := range predicates {
-			fit, err := predicate(pod, machineToPods[node.ID], node.ID)
+			fit, err := predicate(pod, machineToPods[node.Name], node.Name)
 			if err != nil {
 				return api.MinionList{}, err
 			}
@@ -111,7 +111,7 @@ func EqualPriority(pod api.Pod, podLister PodLister, minionLister MinionLister)
 	}
 	for _, minion := range nodes.Items {
 		result = append(result, HostPriority{
-			host:  minion.ID,
+			host:  minion.Name,
 			score: 1,
 		})
 	}

pkg/scheduler/generic_scheduler_test.go

@@ -34,7 +34,7 @@ func truePredicate(pod api.Pod, existingPods []api.Pod, node string) (bool, erro
 }
 
 func matchesPredicate(pod api.Pod, existingPods []api.Pod, node string) (bool, error) {
-	return pod.ID == node, nil
+	return pod.Name == node, nil
 }
 
 func numericPriority(pod api.Pod, podLister PodLister, minionLister MinionLister) (HostPriorityList, error) {
@@ -46,12 +46,12 @@ func numericPriority(pod api.Pod, podLister PodLister, minionLister MinionLister
 		return nil, err
 	}
 	for _, minion := range nodes.Items {
-		score, err := strconv.Atoi(minion.ID)
+		score, err := strconv.Atoi(minion.Name)
 		if err != nil {
 			return nil, err
 		}
 		result = append(result, HostPriority{
-			host:  minion.ID,
+			host:  minion.Name,
 			score: score,
 		})
 	}
@@ -63,7 +63,7 @@ func makeMinionList(nodeNames []string) api.MinionList {
 		Items: make([]api.Minion, len(nodeNames)),
 	}
 	for ix := range nodeNames {
-		result.Items[ix].ID = nodeNames[ix]
+		result.Items[ix].Name = nodeNames[ix]
 	}
 	return result
 }
@@ -95,7 +95,7 @@ func TestGenericScheduler(t *testing.T) {
 			predicates:   []FitPredicate{matchesPredicate},
 			prioritizer:  EqualPriority,
 			nodes:        []string{"machine1", "machine2"},
-			pod:          api.Pod{TypeMeta: api.TypeMeta{ID: "machine2"}},
+			pod:          api.Pod{TypeMeta: api.TypeMeta{Name: "machine2"}},
 			expectedHost: "machine2",
 		},
 		{
@@ -108,7 +108,7 @@ func TestGenericScheduler(t *testing.T) {
 			predicates:   []FitPredicate{matchesPredicate},
 			prioritizer:  numericPriority,
 			nodes:        []string{"3", "2", "1"},
-			pod:          api.Pod{TypeMeta: api.TypeMeta{ID: "2"}},
+			pod:          api.Pod{TypeMeta: api.TypeMeta{Name: "2"}},
 			expectedHost: "2",
 		},
 		{

pkg/scheduler/predicates.go

@@ -36,7 +36,7 @@ type StaticNodeInfo struct {
 
 func (nodes StaticNodeInfo) GetNodeInfo(nodeID string) (*api.Minion, error) {
 	for ix := range nodes.Items {
-		if nodes.Items[ix].ID == nodeID {
+		if nodes.Items[ix].Name == nodeID {
 			return &nodes.Items[ix], nil
 		}
 	}

pkg/scheduler/priorities.go

@@ -47,7 +47,7 @@ func calculateOccupancy(node api.Minion, pods []api.Pod) HostPriority {
 	glog.V(4).Infof("Least Requested Priority, AbsoluteRequested: (%d, %d) Percentage:(%d\\%m, %d\\%)", totalCPU, totalMemory, percentageCPU, percentageMemory)
 
 	return HostPriority{
-		host:  node.ID,
+		host:  node.Name,
 		score: int((percentageCPU + percentageMemory) / 2),
 	}
 }
@@ -65,7 +65,7 @@ func LeastRequestedPriority(pod api.Pod, podLister PodLister, minionLister Minio
 
 	list := HostPriorityList{}
 	for _, node := range nodes.Items {
-		list = append(list, calculateOccupancy(node, podsToMachines[node.ID]))
+		list = append(list, calculateOccupancy(node, podsToMachines[node.Name]))
 	}
 	return list, nil
 }

pkg/scheduler/priorities_test.go

@@ -27,7 +27,7 @@ import (
 
 func makeMinion(node string, cpu, memory int) api.Minion {
 	return api.Minion{
-		TypeMeta: api.TypeMeta{ID: node},
+		TypeMeta: api.TypeMeta{Name: node},
 		NodeResources: api.NodeResources{
 			Capacity: api.ResourceList{
 				resources.CPU:    util.NewIntOrStringFromInt(cpu),

pkg/scheduler/spreading.go

@@ -44,7 +44,7 @@ func CalculateSpreadPriority(pod api.Pod, podLister PodLister, minionLister Mini
 
 	result := []HostPriority{}
 	for _, minion := range minions.Items {
-		result = append(result, HostPriority{host: minion.ID, score: counts[minion.ID]})
+		result = append(result, HostPriority{host: minion.Name, score: counts[minion.Name]})
 	}
 	return result, nil
 }

pkg/service/endpoints_controller.go

@@ -72,13 +72,13 @@ func (e *EndpointController) SyncServiceEndpoints() error {
 			}
 			endpoints = append(endpoints, net.JoinHostPort(pod.CurrentState.PodIP, strconv.Itoa(port)))
 		}
-		currentEndpoints, err := e.client.GetEndpoints(nsCtx, service.ID)
+		currentEndpoints, err := e.client.GetEndpoints(nsCtx, service.Name)
 		if err != nil {
 			// TODO this is brittle as all get out, refactor the client libraries to return a structured error.
 			if errors.IsNotFound(err) {
 				currentEndpoints = &api.Endpoints{
 					TypeMeta: api.TypeMeta{
-						ID: service.ID,
+						Name: service.Name,
 					},
 				}
 			} else {
@@ -96,7 +96,7 @@ func (e *EndpointController) SyncServiceEndpoints() error {
 		} else {
 			// Pre-existing
 			if endpointsEqual(currentEndpoints, endpoints) {
-				glog.V(2).Infof("endpoints are equal for %s, skipping update", service.ID)
+				glog.V(2).Infof("endpoints are equal for %s, skipping update", service.Name)
 				continue
 			}
 			_, err = e.client.UpdateEndpoints(nsCtx, newEndpoints)

pkg/service/endpoints_controller_test.go

@@ -35,7 +35,7 @@ func newPodList(count int) api.PodList {
 	for i := 0; i < count; i++ {
 		pods = append(pods, api.Pod{
 			TypeMeta: api.TypeMeta{
-				ID:         fmt.Sprintf("pod%d", i),
+				Name:       fmt.Sprintf("pod%d", i),
 				APIVersion: testapi.Version(),
 			},
 			DesiredState: api.PodState{
@@ -181,7 +181,7 @@ func TestSyncEndpointsItemsPreexisting(t *testing.T) {
 	serviceList := api.ServiceList{
 		Items: []api.Service{
 			{
-				TypeMeta: api.TypeMeta{ID: "foo"},
+				TypeMeta: api.TypeMeta{Name: "foo"},
 				Selector: map[string]string{
 					"foo": "bar",
 				},
@@ -193,7 +193,7 @@ func TestSyncEndpointsItemsPreexisting(t *testing.T) {
 		serverResponse{http.StatusOK, serviceList},
 		serverResponse{http.StatusOK, api.Endpoints{
 			TypeMeta: api.TypeMeta{
-				ID:              "foo",
+				Name:            "foo",
 				ResourceVersion: "1",
 			},
 			Endpoints: []string{"6.7.8.9:1000"},
@@ -205,7 +205,7 @@ func TestSyncEndpointsItemsPreexisting(t *testing.T) {
 	}
 	data := runtime.EncodeOrDie(testapi.Codec(), &api.Endpoints{
 		TypeMeta: api.TypeMeta{
-			ID:              "foo",
+			Name:            "foo",
 			ResourceVersion: "1",
 		},
 		Endpoints: []string{"1.2.3.4:8080"},
@@ -217,7 +217,7 @@ func TestSyncEndpointsItemsPreexistingIdentical(t *testing.T) {
 	serviceList := api.ServiceList{
 		Items: []api.Service{
 			{
-				TypeMeta: api.TypeMeta{ID: "foo"},
+				TypeMeta: api.TypeMeta{Name: "foo"},
 				Selector: map[string]string{
 					"foo": "bar",
 				},
@@ -245,7 +245,7 @@ func TestSyncEndpointsItems(t *testing.T) {
 	serviceList := api.ServiceList{
 		Items: []api.Service{
 			{
-				TypeMeta: api.TypeMeta{ID: "foo"},
+				TypeMeta: api.TypeMeta{Name: "foo"},
 				Selector: map[string]string{
 					"foo": "bar",
 				},

pkg/tools/etcd_tools_test.go

@@ -73,15 +73,15 @@ func TestExtractToList(t *testing.T) {
 			Node: &etcd.Node{
 				Nodes: []*etcd.Node{
 					{
-						Value:         `{"id":"foo"}`,
+						Value:         `{"name":"foo"}`,
 						ModifiedIndex: 1,
 					},
 					{
-						Value:         `{"id":"bar"}`,
+						Value:         `{"name":"bar"}`,
 						ModifiedIndex: 2,
 					},
 					{
-						Value:         `{"id":"baz"}`,
+						Value:         `{"name":"baz"}`,
 						ModifiedIndex: 3,
 					},
 				},
@@ -91,9 +91,9 @@ func TestExtractToList(t *testing.T) {
 	expect := api.PodList{
 		TypeMeta: api.TypeMeta{ResourceVersion: "10"},
 		Items: []api.Pod{
-			{TypeMeta: api.TypeMeta{ID: "foo", ResourceVersion: "1"}},
-			{TypeMeta: api.TypeMeta{ID: "bar", ResourceVersion: "2"}},
-			{TypeMeta: api.TypeMeta{ID: "baz", ResourceVersion: "3"}},
+			{TypeMeta: api.TypeMeta{Name: "foo", ResourceVersion: "1"}},
+			{TypeMeta: api.TypeMeta{Name: "bar", ResourceVersion: "2"}},
+			{TypeMeta: api.TypeMeta{Name: "baz", ResourceVersion: "3"}},
 		},
 	}
 
@@ -117,21 +117,21 @@ func TestExtractToListAcrossDirectories(t *testing.T) {
 			Node: &etcd.Node{
 				Nodes: []*etcd.Node{
 					{
-						Value: `{"id": "directory1"}`,
+						Value: `{"name": "directory1"}`,
 						Dir:   true,
 						Nodes: []*etcd.Node{
 							{
-								Value:         `{"id":"foo"}`,
+								Value:         `{"name":"foo"}`,
 								ModifiedIndex: 1,
 							},
 						},
 					},
 					{
-						Value: `{"id": "directory2"}`,
+						Value: `{"name": "directory2"}`,
 						Dir:   true,
 						Nodes: []*etcd.Node{
 							{
-								Value:         `{"id":"bar"}`,
+								Value:         `{"name":"bar"}`,
 								ModifiedIndex: 2,
 							},
 						},
@@ -143,8 +143,8 @@ func TestExtractToListAcrossDirectories(t *testing.T) {
 	expect := api.PodList{
 		TypeMeta: api.TypeMeta{ResourceVersion: "10"},
 		Items: []api.Pod{
-			{TypeMeta: api.TypeMeta{ID: "foo", ResourceVersion: "1"}},
-			{TypeMeta: api.TypeMeta{ID: "bar", ResourceVersion: "2"}},
+			{TypeMeta: api.TypeMeta{Name: "foo", ResourceVersion: "1"}},
+			{TypeMeta: api.TypeMeta{Name: "bar", ResourceVersion: "2"}},
 		},
 	}
 
@@ -167,19 +167,19 @@ func TestExtractToListExcludesDirectories(t *testing.T) {
 			Node: &etcd.Node{
 				Nodes: []*etcd.Node{
 					{
-						Value:         `{"id":"foo"}`,
+						Value:         `{"name":"foo"}`,
 						ModifiedIndex: 1,
 					},
 					{
-						Value:         `{"id":"bar"}`,
+						Value:         `{"name":"bar"}`,
 						ModifiedIndex: 2,
 					},
 					{
-						Value:         `{"id":"baz"}`,
+						Value:         `{"name":"baz"}`,
 						ModifiedIndex: 3,
 					},
 					{
-						Value: `{"id": "directory"}`,
+						Value: `{"name": "directory"}`,
 						Dir:   true,
 					},
 				},
@@ -189,9 +189,9 @@ func TestExtractToListExcludesDirectories(t *testing.T) {
 	expect := api.PodList{
 		TypeMeta: api.TypeMeta{ResourceVersion: "10"},
 		Items: []api.Pod{
-			{TypeMeta: api.TypeMeta{ID: "foo", ResourceVersion: "1"}},
-			{TypeMeta: api.TypeMeta{ID: "bar", ResourceVersion: "2"}},
-			{TypeMeta: api.TypeMeta{ID: "baz", ResourceVersion: "3"}},
+			{TypeMeta: api.TypeMeta{Name: "foo", ResourceVersion: "1"}},
+			{TypeMeta: api.TypeMeta{Name: "bar", ResourceVersion: "2"}},
+			{TypeMeta: api.TypeMeta{Name: "baz", ResourceVersion: "3"}},
 		},
 	}
 
@@ -208,7 +208,7 @@ func TestExtractToListExcludesDirectories(t *testing.T) {
 
 func TestExtractObj(t *testing.T) {
 	fakeClient := NewFakeEtcdClient(t)
-	expect := api.Pod{TypeMeta: api.TypeMeta{ID: "foo"}}
+	expect := api.Pod{TypeMeta: api.TypeMeta{Name: "foo"}}
 	fakeClient.Set("/some/key", util.EncodeJSON(expect), 0)
 	helper := EtcdHelper{fakeClient, latest.Codec, versioner}
 	var got api.Pod
@@ -262,7 +262,7 @@ func TestExtractObjNotFoundErr(t *testing.T) {
 }
 
 func TestCreateObj(t *testing.T) {
-	obj := &api.Pod{TypeMeta: api.TypeMeta{ID: "foo"}}
+	obj := &api.Pod{TypeMeta: api.TypeMeta{Name: "foo"}}
 	fakeClient := NewFakeEtcdClient(t)
 	helper := EtcdHelper{fakeClient, latest.Codec, versioner}
 	err := helper.CreateObj("/some/key", obj, 5)
@@ -283,7 +283,7 @@ func TestCreateObj(t *testing.T) {
 }
 
 func TestSetObj(t *testing.T) {
-	obj := &api.Pod{TypeMeta: api.TypeMeta{ID: "foo"}}
+	obj := &api.Pod{TypeMeta: api.TypeMeta{Name: "foo"}}
 	fakeClient := NewFakeEtcdClient(t)
 	helper := EtcdHelper{fakeClient, latest.Codec, versioner}
 	err := helper.SetObj("/some/key", obj)
@@ -302,7 +302,7 @@ func TestSetObj(t *testing.T) {
 }
 
 func TestSetObjWithVersion(t *testing.T) {
-	obj := &api.Pod{TypeMeta: api.TypeMeta{ID: "foo", ResourceVersion: "1"}}
+	obj := &api.Pod{TypeMeta: api.TypeMeta{Name: "foo", ResourceVersion: "1"}}
 	fakeClient := NewFakeEtcdClient(t)
 	fakeClient.TestIndex = true
 	fakeClient.Data["/some/key"] = EtcdResponseWithError{
@@ -331,7 +331,7 @@ func TestSetObjWithVersion(t *testing.T) {
 }
 
 func TestSetObjWithoutResourceVersioner(t *testing.T) {
-	obj := &api.Pod{TypeMeta: api.TypeMeta{ID: "foo"}}
+	obj := &api.Pod{TypeMeta: api.TypeMeta{Name: "foo"}}
 	fakeClient := NewFakeEtcdClient(t)
 	helper := EtcdHelper{fakeClient, latest.Codec, nil}
 	err := helper.SetObj("/some/key", obj)
@@ -356,7 +356,7 @@ func TestAtomicUpdate(t *testing.T) {
 
 	// Create a new node.
 	fakeClient.ExpectNotFoundGet("/some/key")
-	obj := &TestResource{TypeMeta: api.TypeMeta{ID: "foo"}, Value: 1}
+	obj := &TestResource{TypeMeta: api.TypeMeta{Name: "foo"}, Value: 1}
 	err := helper.AtomicUpdate("/some/key", &TestResource{}, func(in runtime.Object) (runtime.Object, error) {
 		return obj, nil
 	})
@@ -375,7 +375,7 @@ func TestAtomicUpdate(t *testing.T) {
 
 	// Update an existing node.
 	callbackCalled := false
-	objUpdate := &TestResource{TypeMeta: api.TypeMeta{ID: "foo"}, Value: 2}
+	objUpdate := &TestResource{TypeMeta: api.TypeMeta{Name: "foo"}, Value: 2}
 	err = helper.AtomicUpdate("/some/key", &TestResource{}, func(in runtime.Object) (runtime.Object, error) {
 		callbackCalled = true
 
@@ -410,7 +410,7 @@ func TestAtomicUpdateNoChange(t *testing.T) {
 
 	// Create a new node.
 	fakeClient.ExpectNotFoundGet("/some/key")
-	obj := &TestResource{TypeMeta: api.TypeMeta{ID: "foo"}, Value: 1}
+	obj := &TestResource{TypeMeta: api.TypeMeta{Name: "foo"}, Value: 1}
 	err := helper.AtomicUpdate("/some/key", &TestResource{}, func(in runtime.Object) (runtime.Object, error) {
 		return obj, nil
 	})
@@ -420,7 +420,7 @@ func TestAtomicUpdateNoChange(t *testing.T) {
 
 	// Update an existing node with the same data
 	callbackCalled := false
-	objUpdate := &TestResource{TypeMeta: api.TypeMeta{ID: "foo"}, Value: 1}
+	objUpdate := &TestResource{TypeMeta: api.TypeMeta{Name: "foo"}, Value: 1}
 	fakeClient.Err = errors.New("should not be called")
 	err = helper.AtomicUpdate("/some/key", &TestResource{}, func(in runtime.Object) (runtime.Object, error) {
 		callbackCalled = true
@@ -463,7 +463,7 @@ func TestAtomicUpdate_CreateCollision(t *testing.T) {
 				}
 
 				currValue := in.(*TestResource).Value
-				obj := &TestResource{TypeMeta: api.TypeMeta{ID: "foo"}, Value: currValue + 1}
+				obj := &TestResource{TypeMeta: api.TypeMeta{Name: "foo"}, Value: currValue + 1}
 				return obj, nil
 			})
 			if err != nil {