github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup: "scaler" -> "scale".

Browse Source 
Cosmetic cleanup: "scaler" replaced with "scale" (the proper name for sub-resource).
This commit is contained in:
Jerzy Szczepkowski
2015-08-11 11:42:48 +02:00
parent 5a9b36b703
commit 84af5594b3
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/registry/experimental/controller/etcd/etcd.go
View File

@@ -61,7 +61,7 @@ func (r *ScaleREST) New() runtime.Object {
func (r *ScaleREST) Get(ctx api.Context, name string) (runtime.Object, error) {
rc, err := (*r.registry).GetController(ctx, name)
if err != nil {
return nil, errors.NewNotFound("scaler", name)
return nil, errors.NewNotFound("scale", name)
}
return &expapi.Scale{
ObjectMeta: api.ObjectMeta{
@@ -83,18 +83,18 @@ func (r *ScaleREST) Update(ctx api.Context, obj runtime.Object) (runtime.Object,
if obj == nil {
return nil, false, errors.NewBadRequest(fmt.Sprintf("nil update passed to Scale"))
}
scaler, ok := obj.(*expapi.Scale)
scale, ok := obj.(*expapi.Scale)
if !ok {
return nil, false, errors.NewBadRequest(fmt.Sprintf("wrong object passed to Scale update: %v", obj))
}
rc, err := (*r.registry).GetController(ctx, scaler.Name)
rc, err := (*r.registry).GetController(ctx, scale.Name)
if err != nil {
return nil, false, errors.NewNotFound("scaler", scaler.Name)
return nil, false, errors.NewNotFound("scale", scale.Name)
}
rc.Spec.Replicas = scaler.Spec.Replicas
rc.Spec.Replicas = scale.Spec.Replicas
rc, err = (*r.registry).UpdateController(ctx, rc)
if err != nil {
return nil, false, errors.NewConflict("scaler", scaler.Name, err)
return nil, false, errors.NewConflict("scale", scale.Name, err)
}
return &expapi.Scale{
ObjectMeta: api.ObjectMeta{

6
pkg/registry/experimental/controller/etcd/etcd_test.go
View File

@@ -106,12 +106,12 @@ func TestGet(t *testing.T) {
storage := NewStorage(etcdStorage).Scale
obj, err := storage.Get(api.WithNamespace(api.NewContext(), "test"), "foo")
scaler := obj.(*expapi.Scale)
scale := obj.(*expapi.Scale)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if e, a := expect, scaler; !api.Semantic.DeepEqual(e, a) {
t.Errorf("Unexpected scaler: %s", util.ObjectDiff(e, a))
if e, a := expect, scale; !api.Semantic.DeepEqual(e, a) {
t.Errorf("Unexpected scale: %s", util.ObjectDiff(e, a))
}
}