vendor: bump runtime-tools to fix caps drop handling
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
parent
ebb88f9a67
commit
c718f15d47
5 changed files with 39 additions and 27 deletions
20
vendor/github.com/opencontainers/runtime-tools/validate/validate.go
generated
vendored
20
vendor/github.com/opencontainers/runtime-tools/validate/validate.go
generated
vendored
|
@ -142,6 +142,8 @@ func JSONSchemaURL(version string) (url string, err error) {
|
|||
// runtime-spec JSON Schema, using the version of the schema that
|
||||
// matches the configuration's declared version.
|
||||
func (v *Validator) CheckJSONSchema() (errs error) {
|
||||
logrus.Debugf("check JSON schema")
|
||||
|
||||
url, err := JSONSchemaURL(v.spec.Version)
|
||||
if err != nil {
|
||||
errs = multierror.Append(errs, err)
|
||||
|
@ -733,7 +735,7 @@ func (v *Validator) CheckLinux() (errs error) {
|
|||
}
|
||||
|
||||
if _, exists := devTypeList[devID]; exists {
|
||||
logrus.Warnf("type:%s, major:%d and minor:%d for linux devices is duplicated", device.Type, device.Major, device.Minor)
|
||||
logrus.Warnf("%v", specerror.NewError(specerror.DevicesErrorOnDup, fmt.Errorf("type:%s, major:%d and minor:%d for linux devices is duplicated", device.Type, device.Major, device.Minor), rspec.Version))
|
||||
} else {
|
||||
devTypeList[devID] = true
|
||||
}
|
||||
|
@ -817,6 +819,18 @@ func (v *Validator) CheckLinuxResources() (errs error) {
|
|||
}
|
||||
}
|
||||
|
||||
if r.BlockIO != nil && r.BlockIO.WeightDevice != nil {
|
||||
for i, weightDevice := range r.BlockIO.WeightDevice {
|
||||
if weightDevice.Weight == nil && weightDevice.LeafWeight == nil {
|
||||
errs = multierror.Append(errs,
|
||||
specerror.NewError(
|
||||
specerror.BlkIOWeightOrLeafWeightExist,
|
||||
fmt.Errorf("linux.resources.blockIO.weightDevice[%d] specifies neither weight nor leafWeight", i),
|
||||
rspec.Version))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -990,5 +1004,9 @@ func checkMandatory(obj interface{}) (errs error) {
|
|||
func (v *Validator) CheckMandatoryFields() error {
|
||||
logrus.Debugf("check mandatory fields")
|
||||
|
||||
if v.spec == nil {
|
||||
return fmt.Errorf("Spec can't be nil")
|
||||
}
|
||||
|
||||
return checkMandatory(v.spec)
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue