github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-16 14:45:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4132 from jszczepkowski/master

Browse Source 
Improve "constraint violation" error message.
This commit is contained in:
Tim Hockin
2015-02-05 13:43:29 -08:00
parent 7a13c2f0e3 18c5fa1ae7
commit a20fb598bc
4 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,8 +214,8 @@ func (r *Registry) assignPod(ctx api.Context, podID string, machine string) erro
err = r.AtomicUpdate(contKey, &api.BoundPods{}, func(in runtime.Object) (runtime.Object, error) {
boundPodList := in.(*api.BoundPods)
boundPodList.Items = append(boundPodList.Items, *boundPod)
if !constraint.Allowed(boundPodList.Items) {
return nil, fmt.Errorf("the assignment would cause a constraint violation")
if errors := constraint.Allowed(boundPodList.Items); len(errors) > 0 {
return nil, fmt.Errorf("the assignment would cause the following constraints violation: %v", errors)
}
return boundPodList, nil
})