github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-08 04:32:37 +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

8
pkg/controller/replication_controller.go
View File

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

4
pkg/controller/replication_controller_test.go
View File

@@ -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 {