mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-13 10:33:35 +00:00
rebase: bump the github-dependencies group across 1 directory with 7 updates
Bumps the github-dependencies group with 6 updates in the / directory: | Package | From | To | | --- | --- | --- | | [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) | `1.55.5` | `1.55.6` | | [github.com/aws/aws-sdk-go-v2/service/sts](https://github.com/aws/aws-sdk-go-v2) | `1.33.2` | `1.33.10` | | [github.com/kubernetes-csi/csi-lib-utils](https://github.com/kubernetes-csi/csi-lib-utils) | `0.19.0` | `0.20.0` | | [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) | `2.22.0` | `2.22.2` | | [github.com/Azure/azure-sdk-for-go/sdk/azidentity](https://github.com/Azure/azure-sdk-for-go) | `1.8.0` | `1.8.1` | | [github.com/csi-addons/kubernetes-csi-addons](https://github.com/csi-addons/kubernetes-csi-addons) | `0.9.0` | `0.11.0` | Updates `github.com/aws/aws-sdk-go` from 1.55.5 to 1.55.6 - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Changelog](https://github.com/aws/aws-sdk-go/blob/main/CHANGELOG_PENDING.md) - [Commits](https://github.com/aws/aws-sdk-go/compare/v1.55.5...v1.55.6) Updates `github.com/aws/aws-sdk-go-v2/service/sts` from 1.33.2 to 1.33.10 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/fms/v1.33.2...service/sns/v1.33.10) Updates `github.com/kubernetes-csi/csi-lib-utils` from 0.19.0 to 0.20.0 - [Release notes](https://github.com/kubernetes-csi/csi-lib-utils/releases) - [Commits](https://github.com/kubernetes-csi/csi-lib-utils/compare/v0.19.0...v0.20.0) Updates `github.com/onsi/ginkgo/v2` from 2.22.0 to 2.22.2 - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/ginkgo/compare/v2.22.0...v2.22.2) Updates `github.com/onsi/gomega` from 1.36.1 to 1.36.2 - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/gomega/compare/v1.36.1...v1.36.2) Updates `github.com/Azure/azure-sdk-for-go/sdk/azidentity` from 1.8.0 to 1.8.1 - [Release notes](https://github.com/Azure/azure-sdk-for-go/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-go/blob/main/documentation/release.md) - [Commits](https://github.com/Azure/azure-sdk-for-go/compare/sdk/azcore/v1.8.0...sdk/azidentity/v1.8.1) Updates `github.com/csi-addons/kubernetes-csi-addons` from 0.9.0 to 0.11.0 - [Release notes](https://github.com/csi-addons/kubernetes-csi-addons/releases) - [Commits](https://github.com/csi-addons/kubernetes-csi-addons/compare/v0.9.0...v0.11.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies - dependency-name: github.com/aws/aws-sdk-go-v2/service/sts dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies - dependency-name: github.com/kubernetes-csi/csi-lib-utils dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-dependencies - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies - dependency-name: github.com/Azure/azure-sdk-for-go/sdk/azidentity dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies - dependency-name: github.com/csi-addons/kubernetes-csi-addons dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
committed by
mergify[bot]
parent
b1834552c1
commit
6bea1775bd
50
vendor/sigs.k8s.io/structured-merge-diff/v4/merge/update.go
generated
vendored
50
vendor/sigs.k8s.io/structured-merge-diff/v4/merge/update.go
generated
vendored
@ -33,6 +33,9 @@ type UpdaterBuilder struct {
|
||||
Converter Converter
|
||||
IgnoreFilter map[fieldpath.APIVersion]fieldpath.Filter
|
||||
|
||||
// IgnoredFields provides a set of fields to ignore for each
|
||||
IgnoredFields map[fieldpath.APIVersion]*fieldpath.Set
|
||||
|
||||
// Stop comparing the new object with old object after applying.
|
||||
// This was initially used to avoid spurious etcd update, but
|
||||
// since that's vastly inefficient, we've come-up with a better
|
||||
@ -46,6 +49,7 @@ func (u *UpdaterBuilder) BuildUpdater() *Updater {
|
||||
return &Updater{
|
||||
Converter: u.Converter,
|
||||
IgnoreFilter: u.IgnoreFilter,
|
||||
IgnoredFields: u.IgnoredFields,
|
||||
returnInputOnNoop: u.ReturnInputOnNoop,
|
||||
}
|
||||
}
|
||||
@ -56,6 +60,9 @@ type Updater struct {
|
||||
// Deprecated: This will eventually become private.
|
||||
Converter Converter
|
||||
|
||||
// Deprecated: This will eventually become private.
|
||||
IgnoredFields map[fieldpath.APIVersion]*fieldpath.Set
|
||||
|
||||
// Deprecated: This will eventually become private.
|
||||
IgnoreFilter map[fieldpath.APIVersion]fieldpath.Filter
|
||||
|
||||
@ -70,8 +77,19 @@ func (s *Updater) update(oldObject, newObject *typed.TypedValue, version fieldpa
|
||||
return nil, nil, fmt.Errorf("failed to compare objects: %v", err)
|
||||
}
|
||||
|
||||
versions := map[fieldpath.APIVersion]*typed.Comparison{
|
||||
version: compare.FilterFields(s.IgnoreFilter[version]),
|
||||
var versions map[fieldpath.APIVersion]*typed.Comparison
|
||||
|
||||
if s.IgnoredFields != nil && s.IgnoreFilter != nil {
|
||||
return nil, nil, fmt.Errorf("IgnoreFilter and IgnoreFilter may not both be set")
|
||||
}
|
||||
if s.IgnoredFields != nil {
|
||||
versions = map[fieldpath.APIVersion]*typed.Comparison{
|
||||
version: compare.ExcludeFields(s.IgnoredFields[version]),
|
||||
}
|
||||
} else {
|
||||
versions = map[fieldpath.APIVersion]*typed.Comparison{
|
||||
version: compare.FilterFields(s.IgnoreFilter[version]),
|
||||
}
|
||||
}
|
||||
|
||||
for manager, managerSet := range managers {
|
||||
@ -101,7 +119,12 @@ func (s *Updater) update(oldObject, newObject *typed.TypedValue, version fieldpa
|
||||
if err != nil {
|
||||
return nil, nil, fmt.Errorf("failed to compare objects: %v", err)
|
||||
}
|
||||
versions[managerSet.APIVersion()] = compare.FilterFields(s.IgnoreFilter[managerSet.APIVersion()])
|
||||
|
||||
if s.IgnoredFields != nil {
|
||||
versions[managerSet.APIVersion()] = compare.ExcludeFields(s.IgnoredFields[managerSet.APIVersion()])
|
||||
} else {
|
||||
versions[managerSet.APIVersion()] = compare.FilterFields(s.IgnoreFilter[managerSet.APIVersion()])
|
||||
}
|
||||
}
|
||||
|
||||
conflictSet := managerSet.Set().Intersection(compare.Modified.Union(compare.Added))
|
||||
@ -154,7 +177,16 @@ func (s *Updater) Update(liveObject, newObject *typed.TypedValue, version fieldp
|
||||
managers[manager] = fieldpath.NewVersionedSet(fieldpath.NewSet(), version, false)
|
||||
}
|
||||
set := managers[manager].Set().Difference(compare.Removed).Union(compare.Modified).Union(compare.Added)
|
||||
ignoreFilter := s.IgnoreFilter[version]
|
||||
|
||||
if s.IgnoredFields != nil && s.IgnoreFilter != nil {
|
||||
return nil, nil, fmt.Errorf("IgnoreFilter and IgnoreFilter may not both be set")
|
||||
}
|
||||
var ignoreFilter fieldpath.Filter
|
||||
if s.IgnoredFields != nil {
|
||||
ignoreFilter = fieldpath.NewExcludeSetFilter(s.IgnoredFields[version])
|
||||
} else {
|
||||
ignoreFilter = s.IgnoreFilter[version]
|
||||
}
|
||||
if ignoreFilter != nil {
|
||||
set = ignoreFilter.Filter(set)
|
||||
}
|
||||
@ -189,7 +221,15 @@ func (s *Updater) Apply(liveObject, configObject *typed.TypedValue, version fiel
|
||||
return nil, fieldpath.ManagedFields{}, fmt.Errorf("failed to get field set: %v", err)
|
||||
}
|
||||
|
||||
ignoreFilter := s.IgnoreFilter[version]
|
||||
if s.IgnoredFields != nil && s.IgnoreFilter != nil {
|
||||
return nil, nil, fmt.Errorf("IgnoreFilter and IgnoreFilter may not both be set")
|
||||
}
|
||||
var ignoreFilter fieldpath.Filter
|
||||
if s.IgnoredFields != nil {
|
||||
ignoreFilter = fieldpath.NewExcludeSetFilter(s.IgnoredFields[version])
|
||||
} else {
|
||||
ignoreFilter = s.IgnoreFilter[version]
|
||||
}
|
||||
if ignoreFilter != nil {
|
||||
set = ignoreFilter.Filter(set)
|
||||
}
|
||||
|
47
vendor/sigs.k8s.io/structured-merge-diff/v4/typed/typed.go
generated
vendored
47
vendor/sigs.k8s.io/structured-merge-diff/v4/typed/typed.go
generated
vendored
@ -32,6 +32,21 @@ const (
|
||||
AllowDuplicates ValidationOptions = iota
|
||||
)
|
||||
|
||||
// extractItemsOptions is the options available when extracting items.
|
||||
type extractItemsOptions struct {
|
||||
appendKeyFields bool
|
||||
}
|
||||
|
||||
type ExtractItemsOption func(*extractItemsOptions)
|
||||
|
||||
// WithAppendKeyFields configures ExtractItems to include key fields.
|
||||
// It is exported for use in configuring ExtractItems.
|
||||
func WithAppendKeyFields() ExtractItemsOption {
|
||||
return func(opts *extractItemsOptions) {
|
||||
opts.appendKeyFields = true
|
||||
}
|
||||
}
|
||||
|
||||
// AsTyped accepts a value and a type and returns a TypedValue. 'v' must have
|
||||
// type 'typeName' in the schema. An error is returned if the v doesn't conform
|
||||
// to the schema.
|
||||
@ -187,7 +202,37 @@ func (tv TypedValue) RemoveItems(items *fieldpath.Set) *TypedValue {
|
||||
}
|
||||
|
||||
// ExtractItems returns a value with only the provided list or map items extracted from the value.
|
||||
func (tv TypedValue) ExtractItems(items *fieldpath.Set) *TypedValue {
|
||||
func (tv TypedValue) ExtractItems(items *fieldpath.Set, opts ...ExtractItemsOption) *TypedValue {
|
||||
options := &extractItemsOptions{}
|
||||
for _, opt := range opts {
|
||||
opt(options)
|
||||
}
|
||||
if options.appendKeyFields {
|
||||
tvPathSet, err := tv.ToFieldSet()
|
||||
if err == nil {
|
||||
keyFieldPathSet := fieldpath.NewSet()
|
||||
items.Iterate(func(path fieldpath.Path) {
|
||||
if !tvPathSet.Has(path) {
|
||||
return
|
||||
}
|
||||
for i, pe := range path {
|
||||
if pe.Key == nil {
|
||||
continue
|
||||
}
|
||||
for _, keyField := range *pe.Key {
|
||||
keyName := keyField.Name
|
||||
// Create a new slice with the same elements as path[:i+1], but set its capacity to len(path[:i+1]).
|
||||
// This ensures that appending to keyFieldPath creates a new underlying array, avoiding accidental
|
||||
// modification of the original slice (path).
|
||||
keyFieldPath := append(path[:i+1:i+1], fieldpath.PathElement{FieldName: &keyName})
|
||||
keyFieldPathSet.Insert(keyFieldPath)
|
||||
}
|
||||
}
|
||||
})
|
||||
items = items.Union(keyFieldPathSet)
|
||||
}
|
||||
}
|
||||
|
||||
tv.value = removeItemsWithSchema(tv.value, items, tv.schema, tv.typeRef, true)
|
||||
return &tv
|
||||
}
|
||||
|
2
vendor/sigs.k8s.io/structured-merge-diff/v4/value/scalar.go
generated
vendored
2
vendor/sigs.k8s.io/structured-merge-diff/v4/value/scalar.go
generated
vendored
@ -43,7 +43,7 @@ func IntCompare(lhs, rhs int64) int {
|
||||
func BoolCompare(lhs, rhs bool) int {
|
||||
if lhs == rhs {
|
||||
return 0
|
||||
} else if lhs == false {
|
||||
} else if !lhs {
|
||||
return -1
|
||||
}
|
||||
return 1
|
||||
|
Reference in New Issue
Block a user