From c3d9197a4bedbab3c84f9e1c7818416618248ea7 Mon Sep 17 00:00:00 2001 From: Deyuan Deng Date: Mon, 6 Oct 2014 16:37:46 -0400 Subject: [PATCH] Rename InsertMinion to CreateMinion. --- pkg/master/master.go | 2 +- pkg/registry/etcd/etcd.go | 2 +- pkg/registry/etcd/etcd_test.go | 4 ++-- pkg/registry/minion/caching_registry.go | 4 ++-- pkg/registry/minion/caching_registry_test.go | 2 +- pkg/registry/minion/cloud_registry.go | 2 +- pkg/registry/minion/doc.go | 3 +-- pkg/registry/minion/healthy_registry.go | 4 ++-- pkg/registry/minion/healthy_registry_test.go | 2 +- pkg/registry/minion/registry.go | 2 +- pkg/registry/minion/rest.go | 2 +- pkg/registry/registrytest/minion.go | 2 +- 12 files changed, 15 insertions(+), 16 deletions(-) diff --git a/pkg/master/master.go b/pkg/master/master.go index 4ad46d6d1d4..b0b140cc7d7 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -113,7 +113,7 @@ func makeMinionRegistry(c *Config) minion.Registry { if minionRegistry == nil { minionRegistry = etcd.NewRegistry(c.EtcdHelper, nil) for _, minionID := range c.Minions { - minionRegistry.InsertMinion(nil, &api.Minion{ + minionRegistry.CreateMinion(nil, &api.Minion{ JSONBase: api.JSONBase{ID: minionID}, NodeResources: c.NodeResources, }) diff --git a/pkg/registry/etcd/etcd.go b/pkg/registry/etcd/etcd.go index d14118b67d6..1cf52af6388 100644 --- a/pkg/registry/etcd/etcd.go +++ b/pkg/registry/etcd/etcd.go @@ -392,7 +392,7 @@ func (r *Registry) ListMinions(ctx api.Context) (*api.MinionList, error) { return minions, err } -func (r *Registry) InsertMinion(ctx api.Context, minion *api.Minion) error { +func (r *Registry) CreateMinion(ctx api.Context, minion *api.Minion) error { err := r.CreateObj(makeMinionKey(minion.ID), minion, 0) return etcderr.InterpretCreateError(err, "minion", minion.ID) } diff --git a/pkg/registry/etcd/etcd_test.go b/pkg/registry/etcd/etcd_test.go index d6723f09c7d..c571d0b0902 100644 --- a/pkg/registry/etcd/etcd_test.go +++ b/pkg/registry/etcd/etcd_test.go @@ -1053,11 +1053,11 @@ func TestEtcdListMinions(t *testing.T) { } } -func TestEtcdInsertMinion(t *testing.T) { +func TestEtcdCreateMinion(t *testing.T) { ctx := api.NewContext() fakeClient := tools.NewFakeEtcdClient(t) registry := NewTestEtcdRegistry(fakeClient) - err := registry.InsertMinion(ctx, &api.Minion{ + err := registry.CreateMinion(ctx, &api.Minion{ JSONBase: api.JSONBase{ID: "foo"}, }) if err != nil { diff --git a/pkg/registry/minion/caching_registry.go b/pkg/registry/minion/caching_registry.go index 0668cc193f7..27abd5accb0 100644 --- a/pkg/registry/minion/caching_registry.go +++ b/pkg/registry/minion/caching_registry.go @@ -81,8 +81,8 @@ func (r *CachingRegistry) DeleteMinion(ctx api.Context, minionID string) error { return r.refresh(ctx, true) } -func (r *CachingRegistry) InsertMinion(ctx api.Context, minion *api.Minion) error { - if err := r.delegate.InsertMinion(ctx, minion); err != nil { +func (r *CachingRegistry) CreateMinion(ctx api.Context, minion *api.Minion) error { + if err := r.delegate.CreateMinion(ctx, minion); err != nil { return err } return r.refresh(ctx, true) diff --git a/pkg/registry/minion/caching_registry_test.go b/pkg/registry/minion/caching_registry_test.go index 592e8479445..221bc21b51f 100644 --- a/pkg/registry/minion/caching_registry_test.go +++ b/pkg/registry/minion/caching_registry_test.go @@ -94,7 +94,7 @@ func TestCachingInsert(t *testing.T) { lastUpdate: fakeClock.Now().Unix(), nodes: expected, } - err := cache.InsertMinion(ctx, &api.Minion{ + err := cache.CreateMinion(ctx, &api.Minion{ JSONBase: api.JSONBase{ID: "foo"}, }) if err != nil { diff --git a/pkg/registry/minion/cloud_registry.go b/pkg/registry/minion/cloud_registry.go index 5dc4b80b42a..5bedb1800d1 100644 --- a/pkg/registry/minion/cloud_registry.go +++ b/pkg/registry/minion/cloud_registry.go @@ -55,7 +55,7 @@ func (r CloudRegistry) DeleteMinion(ctx api.Context, minionID string) error { return fmt.Errorf("unsupported") } -func (r CloudRegistry) InsertMinion(ctx api.Context, minion *api.Minion) error { +func (r CloudRegistry) CreateMinion(ctx api.Context, minion *api.Minion) error { return fmt.Errorf("unsupported") } diff --git a/pkg/registry/minion/doc.go b/pkg/registry/minion/doc.go index b821ced0b48..2d0ed95cc82 100644 --- a/pkg/registry/minion/doc.go +++ b/pkg/registry/minion/doc.go @@ -14,6 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package minion provides Registry interface and implementation -// for storing Minions. +// Package minion provides Registry interface and implementation for storing Minions. package minion diff --git a/pkg/registry/minion/healthy_registry.go b/pkg/registry/minion/healthy_registry.go index 2331188f321..92fb24ba0c2 100644 --- a/pkg/registry/minion/healthy_registry.go +++ b/pkg/registry/minion/healthy_registry.go @@ -62,8 +62,8 @@ func (r *HealthyRegistry) DeleteMinion(ctx api.Context, minionID string) error { return r.delegate.DeleteMinion(ctx, minionID) } -func (r *HealthyRegistry) InsertMinion(ctx api.Context, minion *api.Minion) error { - return r.delegate.InsertMinion(ctx, minion) +func (r *HealthyRegistry) CreateMinion(ctx api.Context, minion *api.Minion) error { + return r.delegate.CreateMinion(ctx, minion) } func (r *HealthyRegistry) ListMinions(ctx api.Context) (currentMinions *api.MinionList, err error) { diff --git a/pkg/registry/minion/healthy_registry_test.go b/pkg/registry/minion/healthy_registry_test.go index f2eb8c7f17d..3839ac7664e 100644 --- a/pkg/registry/minion/healthy_registry_test.go +++ b/pkg/registry/minion/healthy_registry_test.go @@ -54,7 +54,7 @@ func TestBasicDelegation(t *testing.T) { if !reflect.DeepEqual(list, &mockMinionRegistry.Minions) { t.Errorf("Expected %v, Got %v", mockMinionRegistry.Minions, list) } - err = healthy.InsertMinion(ctx, &api.Minion{ + err = healthy.CreateMinion(ctx, &api.Minion{ JSONBase: api.JSONBase{ID: "foo"}, }) if err != nil { diff --git a/pkg/registry/minion/registry.go b/pkg/registry/minion/registry.go index 4a0cf633b06..129f8d98a9e 100644 --- a/pkg/registry/minion/registry.go +++ b/pkg/registry/minion/registry.go @@ -21,7 +21,7 @@ import "github.com/GoogleCloudPlatform/kubernetes/pkg/api" // MinionRegistry is an interface for things that know how to store minions. type Registry interface { ListMinions(ctx api.Context) (*api.MinionList, error) - InsertMinion(ctx api.Context, minion *api.Minion) error + CreateMinion(ctx api.Context, minion *api.Minion) error ContainsMinion(ctx api.Context, minionID string) (bool, error) DeleteMinion(ctx api.Context, minionID string) error } diff --git a/pkg/registry/minion/rest.go b/pkg/registry/minion/rest.go index 10350b562e7..e16d2dc5254 100644 --- a/pkg/registry/minion/rest.go +++ b/pkg/registry/minion/rest.go @@ -52,7 +52,7 @@ func (rs *REST) Create(ctx api.Context, obj runtime.Object) (<-chan runtime.Obje minion.CreationTimestamp = util.Now() return apiserver.MakeAsync(func() (runtime.Object, error) { - err := rs.registry.InsertMinion(ctx, minion) + err := rs.registry.CreateMinion(ctx, minion) if err != nil { return nil, err } diff --git a/pkg/registry/registrytest/minion.go b/pkg/registry/registrytest/minion.go index 0fc61cbe641..1cf756cb619 100644 --- a/pkg/registry/registrytest/minion.go +++ b/pkg/registry/registrytest/minion.go @@ -52,7 +52,7 @@ func (r *MinionRegistry) ListMinions(ctx api.Context) (*api.MinionList, error) { return &r.Minions, r.Err } -func (r *MinionRegistry) InsertMinion(ctx api.Context, minion *api.Minion) error { +func (r *MinionRegistry) CreateMinion(ctx api.Context, minion *api.Minion) error { r.Lock() defer r.Unlock() r.Minion = minion.ID