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

Expose an Encoding/Versioning interface for use with etcd

Browse Source 
etcd_tools.go is not dependent on the specific implementation
(which is provided by pkg/api).  All EtcdHelpers are created
with an encoding object which handles Encode/Decode/DecodeInto.
Additional tests added to verify simple atomic flows.

Begins to break up api singleton pattern.
This commit is contained in:
Clayton Coleman
2014-08-03 20:23:56 -04:00
parent 2282f9ce3a
commit 4448be2d95
7 changed files with 216 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/controller/replication_controller.go
View File

@@ -34,7 +34,7 @@ import (
// TODO: Allow choice of switching between etcd/apiserver watching, or remove etcd references
// from this file completely.
type ReplicationManager struct {
etcdClient tools.EtcdClient
etcdHelper tools.EtcdHelper
kubeClient client.Interface
podControl PodControlInterface
syncTime <-chan time.Time
@@ -84,7 +84,7 @@ func (r RealPodControl) deletePod(podID string) error {
func MakeReplicationManager(etcdClient tools.EtcdClient, kubeClient client.Interface) *ReplicationManager {
rm := &ReplicationManager{
kubeClient: kubeClient,
etcdClient: etcdClient,
etcdHelper: tools.EtcdHelper{etcdClient, api.Encoding, api.Versioning},
podControl: RealPodControl{
kubeClient: kubeClient,
},
@@ -102,8 +102,7 @@ func (rm *ReplicationManager) Run(period time.Duration) {
// makeEtcdWatch starts watching via etcd.
func (rm *ReplicationManager) makeEtcdWatch() (watch.Interface, error) {
helper := tools.EtcdHelper{rm.etcdClient}
return helper.WatchList("/registry/controllers", tools.Everything)
return rm.etcdHelper.WatchList("/registry/controllers", tools.Everything)
}
// makeAPIWatch starts watching via the apiserver.
@@ -192,8 +191,7 @@ func (rm *ReplicationManager) syncReplicationController(controllerSpec api.Repli
func (rm *ReplicationManager) synchronize() {
var controllerSpecs []api.ReplicationController
helper := tools.EtcdHelper{rm.etcdClient}
err := helper.ExtractList("/registry/controllers", &controllerSpecs)
err := rm.etcdHelper.ExtractList("/registry/controllers", &controllerSpecs)
if err != nil {
glog.Errorf("Synchronization error: %v (%#v)", err, err)
return