github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 05:21:58 +00:00
Code Issues Projects Releases Wiki Activity

Rename InsertMinion to CreateMinion.

Browse Source
This commit is contained in:
Deyuan Deng 2014-10-06 16:37:46 -04:00
parent 4a35325f29
commit c3d9197a4b
12 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/master/master.go
View File

@ -113,7 +113,7 @@ func makeMinionRegistry(c *Config) minion.Registry {
if minionRegistry == nil { if minionRegistry == nil {
minionRegistry = etcd.NewRegistry(c.EtcdHelper, nil) minionRegistry = etcd.NewRegistry(c.EtcdHelper, nil)
for _, minionID := range c.Minions { for _, minionID := range c.Minions {
minionRegistry.InsertMinion(nil, &api.Minion{ minionRegistry.CreateMinion(nil, &api.Minion{
JSONBase: api.JSONBase{ID: minionID}, JSONBase: api.JSONBase{ID: minionID},
NodeResources: c.NodeResources, NodeResources: c.NodeResources,
}) })

2
pkg/registry/etcd/etcd.go
View File

@ -392,7 +392,7 @@ func (r *Registry) ListMinions(ctx api.Context) (*api.MinionList, error) {
return minions, err 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) err := r.CreateObj(makeMinionKey(minion.ID), minion, 0)
return etcderr.InterpretCreateError(err, "minion", minion.ID) return etcderr.InterpretCreateError(err, "minion", minion.ID)
} }

4
pkg/registry/etcd/etcd_test.go
View File

@ -1053,11 +1053,11 @@ func TestEtcdListMinions(t *testing.T) {
} }
} }
func TestEtcdInsertMinion(t *testing.T) { func TestEtcdCreateMinion(t *testing.T) {
ctx := api.NewContext() ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
err := registry.InsertMinion(ctx, &api.Minion{ err := registry.CreateMinion(ctx, &api.Minion{
JSONBase: api.JSONBase{ID: "foo"}, JSONBase: api.JSONBase{ID: "foo"},
}) })
if err != nil { if err != nil {

4
pkg/registry/minion/caching_registry.go
View File

@ -81,8 +81,8 @@ func (r *CachingRegistry) DeleteMinion(ctx api.Context, minionID string) error {
return r.refresh(ctx, true) return r.refresh(ctx, true)
} }
func (r *CachingRegistry) InsertMinion(ctx api.Context, minion *api.Minion) error { func (r *CachingRegistry) CreateMinion(ctx api.Context, minion *api.Minion) error {
if err := r.delegate.InsertMinion(ctx, minion); err != nil { if err := r.delegate.CreateMinion(ctx, minion); err != nil {
return err return err
} }
return r.refresh(ctx, true) return r.refresh(ctx, true)

2
pkg/registry/minion/caching_registry_test.go
View File

@ -94,7 +94,7 @@ func TestCachingInsert(t *testing.T) {
lastUpdate: fakeClock.Now().Unix(), lastUpdate: fakeClock.Now().Unix(),
nodes: expected, nodes: expected,
} }
err := cache.InsertMinion(ctx, &api.Minion{ err := cache.CreateMinion(ctx, &api.Minion{
JSONBase: api.JSONBase{ID: "foo"}, JSONBase: api.JSONBase{ID: "foo"},
}) })
if err != nil { if err != nil {

2
pkg/registry/minion/cloud_registry.go
View File

@ -55,7 +55,7 @@ func (r CloudRegistry) DeleteMinion(ctx api.Context, minionID string) error {
return fmt.Errorf("unsupported") 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") return fmt.Errorf("unsupported")
} }

3
pkg/registry/minion/doc.go
View File

@ -14,6 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// Package minion provides Registry interface and implementation // Package minion provides Registry interface and implementation for storing Minions.
// for storing Minions.
package minion package minion

4
pkg/registry/minion/healthy_registry.go
View File

@ -62,8 +62,8 @@ func (r *HealthyRegistry) DeleteMinion(ctx api.Context, minionID string) error {
return r.delegate.DeleteMinion(ctx, minionID) return r.delegate.DeleteMinion(ctx, minionID)
} }
func (r *HealthyRegistry) InsertMinion(ctx api.Context, minion *api.Minion) error { func (r *HealthyRegistry) CreateMinion(ctx api.Context, minion *api.Minion) error {
return r.delegate.InsertMinion(ctx, minion) return r.delegate.CreateMinion(ctx, minion)
} }
func (r *HealthyRegistry) ListMinions(ctx api.Context) (currentMinions *api.MinionList, err error) { func (r *HealthyRegistry) ListMinions(ctx api.Context) (currentMinions *api.MinionList, err error) {

2
pkg/registry/minion/healthy_registry_test.go
View File

@ -54,7 +54,7 @@ func TestBasicDelegation(t *testing.T) {
if !reflect.DeepEqual(list, &mockMinionRegistry.Minions) { if !reflect.DeepEqual(list, &mockMinionRegistry.Minions) {
t.Errorf("Expected %v, Got %v", mockMinionRegistry.Minions, list) 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"}, JSONBase: api.JSONBase{ID: "foo"},
}) })
if err != nil { if err != nil {

2
pkg/registry/minion/registry.go
View File

@ -21,7 +21,7 @@ import "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
// MinionRegistry is an interface for things that know how to store minions. // MinionRegistry is an interface for things that know how to store minions.
type Registry interface { type Registry interface {
ListMinions(ctx api.Context) (*api.MinionList, error) 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) ContainsMinion(ctx api.Context, minionID string) (bool, error)
DeleteMinion(ctx api.Context, minionID string) error DeleteMinion(ctx api.Context, minionID string) error
} }

2
pkg/registry/minion/rest.go
View File

@ -52,7 +52,7 @@ func (rs *REST) Create(ctx api.Context, obj runtime.Object) (<-chan runtime.Obje
minion.CreationTimestamp = util.Now() minion.CreationTimestamp = util.Now()
return apiserver.MakeAsync(func() (runtime.Object, error) { return apiserver.MakeAsync(func() (runtime.Object, error) {
err := rs.registry.InsertMinion(ctx, minion) err := rs.registry.CreateMinion(ctx, minion)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
pkg/registry/registrytest/minion.go
View File

@ -52,7 +52,7 @@ func (r *MinionRegistry) ListMinions(ctx api.Context) (*api.MinionList, error) {
return &r.Minions, r.Err 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() r.Lock()
defer r.Unlock() defer r.Unlock()
r.Minion = minion.ID r.Minion = minion.ID