scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #227 from thockin/cleanups

Browse Source 
Rename Kubelet.Client -> EtcdClient
This commit is contained in:
Daniel Smith
2014-06-24 13:26:59 -07:00
parent dec3e09aa7 7622bb871b
commit cf041acc29
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubelet/kubelet.go
View File

@@ -68,7 +68,7 @@ type CadvisorInterface interface {
// The main kubelet implementation // The main kubelet implementation
type Kubelet struct { type Kubelet struct {
Hostname string Hostname string
Client util.EtcdClient EtcdClient util.EtcdClient
DockerClient DockerInterface DockerClient DockerInterface
CadvisorClient CadvisorInterface CadvisorClient CadvisorInterface
FileCheckFrequency time.Duration FileCheckFrequency time.Duration
@@ -106,7 +106,7 @@ func (kl *Kubelet) RunKubelet(config_path, manifest_url, etcd_servers, address s
if etcd_servers != "" { if etcd_servers != "" {
servers := []string{etcd_servers} servers := []string{etcd_servers}
log.Printf("Creating etcd client pointing to %v", servers) log.Printf("Creating etcd client pointing to %v", servers)
kl.Client = etcd.NewClient(servers) kl.EtcdClient = etcd.NewClient(servers)
go util.Forever(func() { kl.SyncAndSetupEtcdWatch(updateChannel) }, 20*time.Second) go util.Forever(func() { kl.SyncAndSetupEtcdWatch(updateChannel) }, 20*time.Second)
} }
if address != "" { if address != "" {
@@ -135,7 +135,7 @@ type SyncHandler interface {
// Log an event to the etcd backend. // Log an event to the etcd backend.
func (kl *Kubelet) LogEvent(event *api.Event) error { func (kl *Kubelet) LogEvent(event *api.Event) error {
if kl.Client == nil { if kl.EtcdClient == nil {
return fmt.Errorf("no etcd client connection.") return fmt.Errorf("no etcd client connection.")
} }
event.Timestamp = time.Now().Unix() event.Timestamp = time.Now().Unix()
@@ -145,7 +145,7 @@ func (kl *Kubelet) LogEvent(event *api.Event) error {
} }
var response *etcd.Response var response *etcd.Response
response, err = kl.Client.AddChild(fmt.Sprintf("/events/%s", event.Container.Name), string(data), 60*60*48 /* 2 days */) response, err = kl.EtcdClient.AddChild(fmt.Sprintf("/events/%s", event.Container.Name), string(data), 60*60*48 /* 2 days */)
// TODO(bburns) : examine response here. // TODO(bburns) : examine response here.
if err != nil { if err != nil {
log.Printf("Error writing event: %s\n", err) log.Printf("Error writing event: %s\n", err)
@@ -513,7 +513,7 @@ func (kl *Kubelet) ResponseToManifests(response *etcd.Response) ([]api.Container
} }
func (kl *Kubelet) getKubeletStateFromEtcd(key string, updateChannel chan<- manifestUpdate) error { func (kl *Kubelet) getKubeletStateFromEtcd(key string, updateChannel chan<- manifestUpdate) error {
response, err := kl.Client.Get(key+"/kubelet", true, false) response, err := kl.EtcdClient.Get(key+"/kubelet", true, false)
if err != nil { if err != nil {
if util.IsEtcdNotFound(err) { if util.IsEtcdNotFound(err) {
return nil return nil
@@ -558,7 +558,7 @@ func (kl *Kubelet) SyncAndSetupEtcdWatch(updateChannel chan<- manifestUpdate) {
kl.getKubeletStateFromEtcd(key, updateChannel) kl.getKubeletStateFromEtcd(key, updateChannel)
log.Printf("Setting up a watch for configuration changes in etcd for %s", key) log.Printf("Setting up a watch for configuration changes in etcd for %s", key)
kl.Client.Watch(key, 0, true, watchChannel, done) kl.EtcdClient.Watch(key, 0, true, watchChannel, done)
} }
} }

12
pkg/kubelet/kubelet_test.go
View File

@@ -400,7 +400,7 @@ func (cr *channelReader) GetList() [][]api.ContainerManifest {
func TestGetKubeletStateFromEtcdNoData(t *testing.T) { func TestGetKubeletStateFromEtcdNoData(t *testing.T) {
fakeClient := util.MakeFakeEtcdClient(t) fakeClient := util.MakeFakeEtcdClient(t)
kubelet := Kubelet{ kubelet := Kubelet{
Client: fakeClient, EtcdClient: fakeClient,
} }
channel := make(chan manifestUpdate) channel := make(chan manifestUpdate)
reader := startReading(channel) reader := startReading(channel)
@@ -422,7 +422,7 @@ func TestGetKubeletStateFromEtcdNoData(t *testing.T) {
func TestGetKubeletStateFromEtcd(t *testing.T) { func TestGetKubeletStateFromEtcd(t *testing.T) {
fakeClient := util.MakeFakeEtcdClient(t) fakeClient := util.MakeFakeEtcdClient(t)
kubelet := Kubelet{ kubelet := Kubelet{
Client: fakeClient, EtcdClient: fakeClient,
} }
channel := make(chan manifestUpdate) channel := make(chan manifestUpdate)
reader := startReading(channel) reader := startReading(channel)
@@ -446,7 +446,7 @@ func TestGetKubeletStateFromEtcd(t *testing.T) {
func TestGetKubeletStateFromEtcdNotFound(t *testing.T) { func TestGetKubeletStateFromEtcdNotFound(t *testing.T) {
fakeClient := util.MakeFakeEtcdClient(t) fakeClient := util.MakeFakeEtcdClient(t)
kubelet := Kubelet{ kubelet := Kubelet{
Client: fakeClient, EtcdClient: fakeClient,
} }
channel := make(chan manifestUpdate) channel := make(chan manifestUpdate)
reader := startReading(channel) reader := startReading(channel)
@@ -468,7 +468,7 @@ func TestGetKubeletStateFromEtcdNotFound(t *testing.T) {
func TestGetKubeletStateFromEtcdError(t *testing.T) { func TestGetKubeletStateFromEtcdError(t *testing.T) {
fakeClient := util.MakeFakeEtcdClient(t) fakeClient := util.MakeFakeEtcdClient(t)
kubelet := Kubelet{ kubelet := Kubelet{
Client: fakeClient, EtcdClient: fakeClient,
} }
channel := make(chan manifestUpdate) channel := make(chan manifestUpdate)
reader := startReading(channel) reader := startReading(channel)
@@ -570,7 +570,7 @@ func TestSyncManifestsDeletes(t *testing.T) {
func TestEventWriting(t *testing.T) { func TestEventWriting(t *testing.T) {
fakeEtcd := util.MakeFakeEtcdClient(t) fakeEtcd := util.MakeFakeEtcdClient(t)
kubelet := &Kubelet{ kubelet := &Kubelet{
Client: fakeEtcd, EtcdClient: fakeEtcd,
} }
expectedEvent := api.Event{ expectedEvent := api.Event{
Event: "test", Event: "test",
@@ -597,7 +597,7 @@ func TestEventWriting(t *testing.T) {
func TestEventWritingError(t *testing.T) { func TestEventWritingError(t *testing.T) {
fakeEtcd := util.MakeFakeEtcdClient(t) fakeEtcd := util.MakeFakeEtcdClient(t)
kubelet := &Kubelet{ kubelet := &Kubelet{
Client: fakeEtcd, EtcdClient: fakeEtcd,
} }
fakeEtcd.Err = fmt.Errorf("test error") fakeEtcd.Err = fmt.Errorf("test error")
err := kubelet.LogEvent(&api.Event{ err := kubelet.LogEvent(&api.Event{