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

Address comments.

Browse Source
This commit is contained in:
Vishnu Kannan
2015-08-18 11:14:52 -07:00
parent 4a148f99d6
commit ec22c2dd82
9 changed files with 28 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/registry/daemon/doc.go
View File

@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
// Package daemon provides Registry interface and it's RESTStorage
// Package daemon provides Registry interface and its RESTStorage
// implementation for storing Daemon api objects.
package daemon

17
pkg/registry/daemon/etcd/etcd_test.go
View File

@@ -543,28 +543,11 @@ func TestEtcdWatchControllersFields(t *testing.T) {
testFieldMap := map[int][]fields.Set{
PASS: {
{"status.currentNumberScheduled": "2"},
{"status.numberMisscheduled": "1"},
{"status.desiredNumberScheduled": "4"},
{"metadata.name": "foo"},
{"status.currentNumberScheduled": "2", "status.numberMisscheduled": "1"},
{"status.currentNumberScheduled": "2", "status.desiredNumberScheduled": "4"},
{"status.currentNumberScheduled": "2", "metadata.name": "foo"},
{"status.desiredNumberScheduled": "4", "metadata.name": "foo"},
{"status.currentNumberScheduled": "2", "status.desiredNumberScheduled": "4", "metadata.name": "foo"},
{"status.currentNumberScheduled": "2", "status.numberMisscheduled": "1", "status.desiredNumberScheduled": "4"},
{"status.currentNumberScheduled": "2", "status.numberMisscheduled": "1", "status.desiredNumberScheduled": "4", "metadata.name": "foo"},
},
FAIL: {
{"status.currentNumberScheduled": "1"},
{"status.numberMisscheduled": "0"},
{"status.desiredNumberScheduled": "5"},
{"metadata.name": "bar"},
{"name": "foo"},
{"status.replicas": "0"},
{"status.currentNumberScheduled": "2", "status.desiredNumberScheduled": "3"},
{"status.numberMisscheduled": "3", "status.desiredNumberScheduled": "5"},
{"status.currentNumberScheduled": "2", "status.desiredNumberScheduled": "4", "metadata.name": "foox"},
},
}
testEtcdActions := []string{

9
pkg/registry/daemon/rest.go
View File

@@ -19,7 +19,6 @@ package daemon
import (
"fmt"
"reflect"
"strconv"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/validation"
@@ -92,17 +91,15 @@ func (daemonStrategy) ValidateUpdate(ctx api.Context, obj, old runtime.Object) f
return append(validationErrorList, updateErrorList...)
}
// AllowUnconditionalUpdate is the default update policy for daemon objects.
func (daemonStrategy) AllowUnconditionalUpdate() bool {
return true
}
// DaemonToSelectableFields returns a label set that represents the object.
// DaemonToSelectableFields returns a field set that represents the object.
func DaemonToSelectableFields(daemon *api.Daemon) fields.Set {
return fields.Set{
"metadata.name": daemon.Name,
"status.currentNumberScheduled": strconv.Itoa(daemon.Status.CurrentNumberScheduled),
"status.numberMisscheduled": strconv.Itoa(daemon.Status.NumberMisscheduled),
"status.desiredNumberScheduled": strconv.Itoa(daemon.Status.DesiredNumberScheduled),
"metadata.name": daemon.Name,
}
}

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

@@ -273,7 +273,7 @@ func (e *Etcd) Update(ctx api.Context, obj runtime.Object) (runtime.Object, bool
return nil, nil, err
}
if newVersion != version {
return nil, nil, kubeerr.NewConflict(e.EndpointName, name, fmt.Errorf("the object has been modified; please apply your changes to the latest version and try again %+v, %+v", version, newVersion))
return nil, nil, kubeerr.NewConflict(e.EndpointName, name, fmt.Errorf("the object has been modified; please apply your changes to the latest version and try again"))
}
}
if err := rest.BeforeUpdate(e.UpdateStrategy, ctx, obj, existing); err != nil {