Merge pull request #81 from brendandburns/local

Fix localkube due to a bad merge.
pull/6/head
Daniel Smith 2014-06-12 13:24:37 -07:00
commit 3e1e3d90a3
1 changed files with 4 additions and 1 deletions

View File

@ -23,6 +23,7 @@ import (
"flag"
"fmt"
"log"
"math/rand"
"net/http"
"os"
"time"
@ -90,8 +91,10 @@ func api_server() {
Client: http.DefaultClient,
Port: *kubelet_port,
}
random := rand.New(rand.NewSource(int64(time.Now().Nanosecond())))
storage := map[string]apiserver.RESTStorage{
"pods": registry.MakePodRegistryStorage(podRegistry, containerInfo, registry.MakeFirstFitScheduler(machineList, podRegistry)),
"pods": registry.MakePodRegistryStorage(podRegistry, containerInfo, registry.MakeFirstFitScheduler(machineList, podRegistry, random)),
"replicationControllers": registry.MakeControllerRegistryStorage(controllerRegistry),
"services": registry.MakeServiceRegistryStorage(serviceRegistry),
}