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

Add more validation for updating node.

Browse Source
This commit is contained in:
Deyuan Deng
2014-11-17 13:22:27 -05:00
parent cc310e0e71
commit c20ceea170
5 changed files with 107 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/api/validation/validation.go
View File

@@ -535,3 +535,15 @@ func ValidateMinion(minion *api.Minion) errs.ValidationErrorList {
allErrs = append(allErrs, validateLabels(minion.Labels)...)
return allErrs
}
// ValidateMinionUpdate tests to make sure a minion update can be applied. Modifies oldMinion.
func ValidateMinionUpdate(oldMinion *api.Minion, minion *api.Minion) errs.ValidationErrorList {
allErrs := errs.ValidationErrorList{}
// TODO: why we need two labels for minion.
oldMinion.Labels = minion.Labels
oldMinion.ObjectMeta.Labels = minion.ObjectMeta.Labels
if !reflect.DeepEqual(oldMinion, minion) {
allErrs = append(allErrs, fmt.Errorf("Update contains more than labels changes"))
}
return allErrs
}

59
pkg/api/validation/validation_test.go
View File

@@ -1065,3 +1065,62 @@ func TestValidateMinion(t *testing.T) {
}
}
}
func TestValidateMinionUpdate(t *testing.T) {
tests := []struct {
oldMinion api.Minion
minion api.Minion
valid bool
}{
{api.Minion{}, api.Minion{}, true},
{api.Minion{
ObjectMeta: api.ObjectMeta{
Name: "foo"}},
api.Minion{
ObjectMeta: api.ObjectMeta{
Name: "bar"},
}, false},
{api.Minion{
ObjectMeta: api.ObjectMeta{
Name: "foo",
Labels: map[string]string{"foo": "bar"},
},
}, api.Minion{
ObjectMeta: api.ObjectMeta{
Name: "foo",
Labels: map[string]string{"foo": "baz"},
},
}, true},
{api.Minion{
ObjectMeta: api.ObjectMeta{
Name: "foo",
},
}, api.Minion{
ObjectMeta: api.ObjectMeta{
Name: "foo",
Labels: map[string]string{"foo": "baz"},
},
}, true},
{api.Minion{
ObjectMeta: api.ObjectMeta{
Name: "foo",
Labels: map[string]string{"bar": "foo"},
},
}, api.Minion{
ObjectMeta: api.ObjectMeta{
Name: "foo",
Labels: map[string]string{"foo": "baz"},
},
}, true},
}
for _, test := range tests {
errs := ValidateMinionUpdate(&test.oldMinion, &test.minion)
if test.valid && len(errs) > 0 {
t.Errorf("Unexpected error: %v", errs)
t.Logf("%#v vs %#v", test.oldMinion.ObjectMeta, test.minion.ObjectMeta)
}
if !test.valid && len(errs) == 0 {
t.Errorf("Unexpected non-error")
}
}
}

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

@@ -105,16 +105,22 @@ func (rs *REST) Update(ctx api.Context, obj runtime.Object) (<-chan apiserver.RE
if !ok {
return nil, fmt.Errorf("not a minion: %#v", obj)
}
if errs := validation.ValidateMinion(minion); len(errs) > 0 {
// TODO: GetMinion will health check the minion, but we shouldn't require the minion to be
// running for updating labels.
oldMinion, err := rs.registry.GetMinion(ctx, minion.Name)
if err != nil {
return nil, err
}
if errs := validation.ValidateMinionUpdate(oldMinion, minion); len(errs) > 0 {
return nil, kerrors.NewInvalid("minion", minion.Name, errs)
}
return apiserver.MakeAsync(func() (runtime.Object, error) {
err := rs.registry.UpdateMinion(ctx, minion)
if err != nil {
return nil, err
}
// TODO: GetMinion will health check the minion, but we shouldn't require the minion to be
// running for updating labels.
return rs.registry.GetMinion(ctx, minion.Name)
}), nil
}

59
pkg/registry/minion/rest_test.go
View File

@@ -17,7 +17,6 @@ limitations under the License.
package minion
import (
"reflect"
"testing"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
@@ -88,7 +87,7 @@ func TestMinionREST(t *testing.T) {
}
}
func TestMinionRESTWithHealthCheck(t *testing.T) {
func TestMinionStorageWithHealthCheck(t *testing.T) {
minionRegistry := registrytest.NewMinionRegistry([]string{}, api.NodeResources{})
minionHealthRegistry := HealthyRegistry{
delegate: minionRegistry,
@@ -120,46 +119,40 @@ func contains(nodes *api.MinionList, nodeID string) bool {
return false
}
func TestMinionRegistryUpdate(t *testing.T) {
minionRegistry := registrytest.NewMinionRegistry([]string{}, api.NodeResources{})
ms := NewREST(minionRegistry)
func TestMinionStorageInvalidUpdate(t *testing.T) {
storage := NewREST(registrytest.NewMinionRegistry([]string{"foo", "bar"}, api.NodeResources{}))
ctx := api.NewContext()
expected_labels := map[string]string{"foo": "bar"}
c, err := ms.Create(ctx, &api.Minion{
ObjectMeta: api.ObjectMeta{Name: "m1"},
Labels: expected_labels,
})
obj, err := storage.Get(ctx, "foo")
if err != nil {
t.Errorf("insert failed")
t.Errorf("Unexpected error: %v", err)
}
result := <-c
created, ok := result.Object.(*api.Minion)
if !ok || created.Name != "m1" {
t.Errorf("insert return value was weird: %#v", result)
minion, ok := obj.(*api.Minion)
if !ok {
t.Fatalf("Object is not a minion: %#v", obj)
}
if !reflect.DeepEqual(expected_labels, created.Labels) {
t.Errorf("unexpected labels: %#v", created.Labels)
minion.HostIP = "1.2.3.4"
if _, err = storage.Update(ctx, minion); err == nil {
t.Error("Unexpected non-error.")
}
}
update := new(api.Minion)
*update = *created
update_labels := map[string]string{"bar": "foo"}
update.Labels = update_labels
c, err = ms.Update(ctx, update)
func TestMinionStorageValidUpdate(t *testing.T) {
storage := NewREST(registrytest.NewMinionRegistry([]string{"foo", "bar"}, api.NodeResources{}))
ctx := api.NewContext()
obj, err := storage.Get(ctx, "foo")
if err != nil {
t.Errorf("update failed")
t.Errorf("Unexpected error: %v", err)
}
result = <-c
updated, ok := result.Object.(*api.Minion)
if !ok || updated.Name != "m1" {
t.Errorf("update return value was weird: %#v", result)
minion, ok := obj.(*api.Minion)
if !ok {
t.Fatalf("Object is not a minion: %#v", obj)
}
if !reflect.DeepEqual(update_labels, updated.Labels) {
t.Errorf("unexpected labels: %#v", updated.Labels)
minion.Labels = map[string]string{
"foo": "bar",
"baz": "home",
}
if _, err = storage.Update(ctx, minion); err != nil {
t.Error("Unexpected error: %v", err)
}
}

2
test/integration/auth_test.go
View File

@@ -306,7 +306,7 @@ func getTestRequests() []struct {
// Normal methods on minions
{"GET", "/api/v1beta1/minions", "", code200},
{"POST", "/api/v1beta1/minions" + syncFlags, aMinion, code200},
{"PUT", "/api/v1beta1/minions/a" + syncFlags, aMinion, code409}, // See #2115 about why 409
{"PUT", "/api/v1beta1/minions/a" + syncFlags, aMinion, code422}, // TODO: GET and put back server-provided fields to avoid a 422
{"GET", "/api/v1beta1/minions", "", code200},
{"GET", "/api/v1beta1/minions/a", "", code200},
{"DELETE", "/api/v1beta1/minions/a" + syncFlags, "", code200},