github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 06:02:18 +00:00
Code Issues Projects Releases Wiki Activity

Remove etcd dependency from controller manager.

Browse Source
This commit is contained in:
Daniel Smith
2014-08-03 20:27:38 -07:00
parent 38c4cdff99
commit b430cebe72
4 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/controller/replication_controller.go
View File

@@ -23,18 +23,14 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
"github.com/golang/glog"
)
// ReplicationManager is responsible for synchronizing ReplicationController objects stored in etcd
// with actual running pods.
// TODO: Allow choice of switching between etcd/apiserver watching, or remove etcd references
// from this file completely.
// ReplicationManager is responsible for synchronizing ReplicationController objects stored
// in the system with actual running pods.
type ReplicationManager struct {
etcdHelper tools.EtcdHelper
kubeClient client.Interface
podControl PodControlInterface
syncTime <-chan time.Time
@@ -81,10 +77,9 @@ func (r RealPodControl) deletePod(podID string) error {
}
// MakeReplicationManager creates a new ReplicationManager.
func MakeReplicationManager(etcdClient tools.EtcdClient, kubeClient client.Interface) *ReplicationManager {
func MakeReplicationManager(kubeClient client.Interface) *ReplicationManager {
rm := &ReplicationManager{
kubeClient: kubeClient,
etcdHelper: tools.EtcdHelper{etcdClient, api.Encoding, api.Versioning},
podControl: RealPodControl{
kubeClient: kubeClient,
},
@@ -100,11 +95,6 @@ func (rm *ReplicationManager) Run(period time.Duration) {
go util.Forever(func() { rm.watchControllers() }, period)
}
// makeEtcdWatch starts watching via etcd.
func (rm *ReplicationManager) makeEtcdWatch() (watch.Interface, error) {
return rm.etcdHelper.WatchList("/registry/controllers", tools.Everything)
}
// makeAPIWatch starts watching via the apiserver.
func (rm *ReplicationManager) makeAPIWatch() (watch.Interface, error) {
// TODO: Fix this ugly type assertion.
@@ -190,12 +180,15 @@ func (rm *ReplicationManager) syncReplicationController(controllerSpec api.Repli
}
func (rm *ReplicationManager) synchronize() {
// TODO: remove this method completely and rely on the watch.
// Add resource version tracking to watch to make this work.
var controllerSpecs []api.ReplicationController
err := rm.etcdHelper.ExtractList("/registry/controllers", &controllerSpecs)
list, err := rm.kubeClient.ListReplicationControllers(labels.Everything())
if err != nil {
glog.Errorf("Synchronization error: %v (%#v)", err, err)
return
}
controllerSpecs = list.Items
wg := sync.WaitGroup{}
wg.Add(len(controllerSpecs))
for ix := range controllerSpecs {

33
pkg/controller/replication_controller_test.go
View File

@@ -19,6 +19,7 @@ package controller
import (
"encoding/json"
"fmt"
"net/http"
"net/http/httptest"
"reflect"
"sync"
@@ -116,7 +117,7 @@ func TestSyncReplicationControllerDoesNothing(t *testing.T) {
fakePodControl := FakePodControl{}
manager := MakeReplicationManager(nil, client)
manager := MakeReplicationManager(client)
manager.podControl = &fakePodControl
controllerSpec := makeReplicationController(2)
@@ -136,7 +137,7 @@ func TestSyncReplicationControllerDeletes(t *testing.T) {
fakePodControl := FakePodControl{}
manager := MakeReplicationManager(nil, client)
manager := MakeReplicationManager(client)
manager.podControl = &fakePodControl
controllerSpec := makeReplicationController(1)
@@ -156,7 +157,7 @@ func TestSyncReplicationControllerCreates(t *testing.T) {
fakePodControl := FakePodControl{}
manager := MakeReplicationManager(nil, client)
manager := MakeReplicationManager(client)
manager.podControl = &fakePodControl
controllerSpec := makeReplicationController(2)
@@ -282,14 +283,31 @@ func TestSyncronize(t *testing.T) {
},
}
fakeHandler := util.FakeHandler{
fakePodHandler := util.FakeHandler{
StatusCode: 200,
ResponseBody: "{\"apiVersion\": \"v1beta1\", \"kind\": \"PodList\"}",
T: t,
}
testServer := httptest.NewTLSServer(&fakeHandler)
fakeControllerHandler := util.FakeHandler{
StatusCode: 200,
ResponseBody: api.EncodeOrDie(&api.ReplicationControllerList{
Items: []api.ReplicationController{
controllerSpec1,
controllerSpec2,
},
}),
T: t,
}
mux := http.NewServeMux()
mux.Handle("/api/v1beta1/pods/", &fakePodHandler)
mux.Handle("/api/v1beta1/replicationControllers/", &fakeControllerHandler)
mux.HandleFunc("/", func(w http.ResponseWriter, req *http.Request) {
w.WriteHeader(http.StatusNotFound)
t.Errorf("Unexpected request for %v", req.RequestURI)
})
testServer := httptest.NewTLSServer(mux)
client := client.New(testServer.URL, nil)
manager := MakeReplicationManager(fakeEtcd, client)
manager := MakeReplicationManager(client)
fakePodControl := FakePodControl{}
manager.podControl = &fakePodControl
@@ -299,9 +317,8 @@ func TestSyncronize(t *testing.T) {
}
func TestWatchControllers(t *testing.T) {
fakeEtcd := tools.MakeFakeEtcdClient(t)
fakeWatcher := watch.NewFake()
manager := MakeReplicationManager(fakeEtcd, nil)
manager := MakeReplicationManager(nil)
manager.watchMaker = func() (watch.Interface, error) {
return fakeWatcher, nil
}