github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Make integration/localkube work with new controller library

Browse Source
This commit is contained in:
Daniel Smith 2014-06-17 17:57:06 -07:00
parent 1b94f7b244
commit d8206503b8
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/integration/integration.go
View File

@ -28,6 +28,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver" "github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client" "github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/controller"
"github.com/GoogleCloudPlatform/kubernetes/pkg/registry" "github.com/GoogleCloudPlatform/kubernetes/pkg/registry"
"github.com/coreos/go-etcd/etcd" "github.com/coreos/go-etcd/etcd"
) )
@ -48,13 +49,12 @@ func main() {
}, "/api/v1beta1") }, "/api/v1beta1")
server := httptest.NewServer(apiserver) server := httptest.NewServer(apiserver)
controllerManager := registry.MakeReplicationManager(etcd.NewClient(servers), controllerManager := controller.MakeReplicationManager(etcd.NewClient(servers),
client.Client{ client.Client{
Host: server.URL, Host: server.URL,
}) })
go controllerManager.Synchronize() controllerManager.Run(10 * time.Second)
go controllerManager.WatchControllers()
// Ok. we're good to go. // Ok. we're good to go.
log.Printf("API Server started on %s", server.URL) log.Printf("API Server started on %s", server.URL)

8
cmd/localkube/localkube.go
View File

@ -29,10 +29,9 @@ import (
"time" "time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client" "github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/controller"
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet" "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet"
"github.com/GoogleCloudPlatform/kubernetes/pkg/master" "github.com/GoogleCloudPlatform/kubernetes/pkg/master"
"github.com/GoogleCloudPlatform/kubernetes/pkg/registry"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/coreos/go-etcd/etcd" "github.com/coreos/go-etcd/etcd"
"github.com/fsouza/go-dockerclient" "github.com/fsouza/go-dockerclient"
) )
@ -86,13 +85,12 @@ func api_server() {
// Starts up a controller manager. Never returns. // Starts up a controller manager. Never returns.
func controller_manager() { func controller_manager() {
controllerManager := registry.MakeReplicationManager(etcd.NewClient([]string{*etcd_server}), controllerManager := controller.MakeReplicationManager(etcd.NewClient([]string{*etcd_server}),
client.Client{ client.Client{
Host: fmt.Sprintf("http://%s:%d", *master_address, *master_port), Host: fmt.Sprintf("http://%s:%d", *master_address, *master_port),
}) })
go util.Forever(func() { controllerManager.Synchronize() }, 20*time.Second) controllerManager.Run(20 * time.Second)
go util.Forever(func() { controllerManager.WatchControllers() }, 20*time.Second)
select {} select {}
} }