github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-13 21:25:09 +00:00
Code Issues Projects Releases Wiki Activity

Rename ID -> Name

Browse Source
This commit is contained in:
Clayton Coleman
2014-10-22 13:02:02 -04:00
parent bdebff5b28
commit bb77a5d15f
107 changed files with 777 additions and 777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/master/master.go
View File

@@ -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,
})
}

2
pkg/master/pod_cache.go
View File

@@ -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)
}

2
pkg/master/pod_cache_test.go
View File

@@ -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",
},