Update osbuild/images to v0.40.0
In addition, simplify the SPEC file to not have to update the minimum required osbuild version gazillion times, but just once. Update the minimum required osbuild version to v109, due to changes in grub2 stages required by the new osbuild/images version. Update osbild SHA in Schutzfile to v109. Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
parent
c138ea6939
commit
2f087f1a6c
190 changed files with 57031 additions and 52810 deletions
16
vendor/github.com/vmware/govmomi/view/container_view.go
generated
vendored
16
vendor/github.com/vmware/govmomi/view/container_view.go
generated
vendored
|
|
@ -91,7 +91,7 @@ func (v ContainerView) Retrieve(ctx context.Context, kind []string, ps []string,
|
|||
}
|
||||
|
||||
// RetrieveWithFilter populates dst as Retrieve does, but only for entities matching the given filter.
|
||||
func (v ContainerView) RetrieveWithFilter(ctx context.Context, kind []string, ps []string, dst interface{}, filter property.Filter) error {
|
||||
func (v ContainerView) RetrieveWithFilter(ctx context.Context, kind []string, ps []string, dst interface{}, filter property.Match) error {
|
||||
if len(filter) == 0 {
|
||||
return v.Retrieve(ctx, kind, ps, dst)
|
||||
}
|
||||
|
|
@ -103,7 +103,7 @@ func (v ContainerView) RetrieveWithFilter(ctx context.Context, kind []string, ps
|
|||
return err
|
||||
}
|
||||
|
||||
objs := filter.MatchObjectContent(content)
|
||||
objs := filter.ObjectContent(content)
|
||||
|
||||
pc := property.DefaultCollector(v.Client())
|
||||
|
||||
|
|
@ -111,10 +111,10 @@ func (v ContainerView) RetrieveWithFilter(ctx context.Context, kind []string, ps
|
|||
}
|
||||
|
||||
// Find returns object references for entities of type kind, matching the given filter.
|
||||
func (v ContainerView) Find(ctx context.Context, kind []string, filter property.Filter) ([]types.ManagedObjectReference, error) {
|
||||
func (v ContainerView) Find(ctx context.Context, kind []string, filter property.Match) ([]types.ManagedObjectReference, error) {
|
||||
if len(filter) == 0 {
|
||||
// Ensure we have at least 1 filter to avoid retrieving all properties.
|
||||
filter = property.Filter{"name": "*"}
|
||||
filter = property.Match{"name": "*"}
|
||||
}
|
||||
|
||||
var content []types.ObjectContent
|
||||
|
|
@ -124,14 +124,14 @@ func (v ContainerView) Find(ctx context.Context, kind []string, filter property.
|
|||
return nil, err
|
||||
}
|
||||
|
||||
return filter.MatchObjectContent(content), nil
|
||||
return filter.ObjectContent(content), nil
|
||||
}
|
||||
|
||||
// FindAny returns object references for entities of type kind, matching any property the given filter.
|
||||
func (v ContainerView) FindAny(ctx context.Context, kind []string, filter property.Filter) ([]types.ManagedObjectReference, error) {
|
||||
func (v ContainerView) FindAny(ctx context.Context, kind []string, filter property.Match) ([]types.ManagedObjectReference, error) {
|
||||
if len(filter) == 0 {
|
||||
// Ensure we have at least 1 filter to avoid retrieving all properties.
|
||||
filter = property.Filter{"name": "*"}
|
||||
filter = property.Match{"name": "*"}
|
||||
}
|
||||
|
||||
var content []types.ObjectContent
|
||||
|
|
@ -141,5 +141,5 @@ func (v ContainerView) FindAny(ctx context.Context, kind []string, filter proper
|
|||
return nil, err
|
||||
}
|
||||
|
||||
return filter.MatchAnyObjectContent(content), nil
|
||||
return filter.AnyObjectContent(content), nil
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue