Merge pull request #121575 from apelisse/update-smd

k8s-publishing-bot · k8s-publishing-bot · commit 96ae302100a8 · 2023-11-01T01:11:23.000Z
Update sigs.k8s.io/structured-merge-diff to v4.4.0

Kubernetes-commit: 593a17d3b6381bfdbf3bc3b36f56cad30d1531df
diff --git a/go.mod b/go.mod
@@ -26,7 +26,7 @@ require (
 	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
-	sigs.k8s.io/structured-merge-diff/v4 v4.3.0
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1
 	sigs.k8s.io/yaml v1.3.0
 )
 
diff --git a/go.sum b/go.sum
@@ -151,7 +151,7 @@ k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSn
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/structured-merge-diff/v4 v4.3.0 h1:UZbZAZfX0wV2zr7YZorDz6GXROfDFj6LvqCRm4VUVKk=
-sigs.k8s.io/structured-merge-diff/v4 v4.3.0/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
diff --git a/pkg/util/managedfields/internal/structuredmerge.go b/pkg/util/managedfields/internal/structuredmerge.go
@@ -25,6 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
 	"sigs.k8s.io/structured-merge-diff/v4/merge"
+	"sigs.k8s.io/structured-merge-diff/v4/typed"
 )
 
 type structuredMergeManager struct {
@@ -95,11 +96,11 @@ func (f *structuredMergeManager) Update(liveObj, newObj runtime.Object, managed
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to convert live object (%v) to proper version: %v", objectGVKNN(liveObj), err)
 	}
-	newObjTyped, err := f.typeConverter.ObjectToTyped(newObjVersioned)
+	newObjTyped, err := f.typeConverter.ObjectToTyped(newObjVersioned, typed.AllowDuplicates)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to convert new object (%v) to smd typed: %v", objectGVKNN(newObjVersioned), err)
 	}
-	liveObjTyped, err := f.typeConverter.ObjectToTyped(liveObjVersioned)
+	liveObjTyped, err := f.typeConverter.ObjectToTyped(liveObjVersioned, typed.AllowDuplicates)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to convert live object (%v) to smd typed: %v", objectGVKNN(liveObjVersioned), err)
 	}
@@ -139,11 +140,13 @@ func (f *structuredMergeManager) Apply(liveObj, patchObj runtime.Object, managed
 		return nil, nil, fmt.Errorf("failed to convert live object (%v) to proper version: %v", objectGVKNN(liveObj), err)
 	}
 
+	// Don't allow duplicates in the applied object.
 	patchObjTyped, err := f.typeConverter.ObjectToTyped(patchObj)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to create typed patch object (%v): %v", objectGVKNN(patchObj), err)
 	}
-	liveObjTyped, err := f.typeConverter.ObjectToTyped(liveObjVersioned)
+
+	liveObjTyped, err := f.typeConverter.ObjectToTyped(liveObjVersioned, typed.AllowDuplicates)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to create typed live object (%v): %v", objectGVKNN(liveObjVersioned), err)
 	}
diff --git a/pkg/util/managedfields/internal/typeconverter.go b/pkg/util/managedfields/internal/typeconverter.go
@@ -32,7 +32,7 @@ import (
 // TypeConverter allows you to convert from runtime.Object to
 // typed.TypedValue and the other way around.
 type TypeConverter interface {
-	ObjectToTyped(runtime.Object) (*typed.TypedValue, error)
+	ObjectToTyped(runtime.Object, ...typed.ValidationOptions) (*typed.TypedValue, error)
 	TypedToObject(*typed.TypedValue) (runtime.Object, error)
 }
 
@@ -54,17 +54,17 @@ func NewTypeConverter(openapiSpec map[string]*spec.Schema, preserveUnknownFields
 	return &typeConverter{parser: tr}, nil
 }
 
-func (c *typeConverter) ObjectToTyped(obj runtime.Object) (*typed.TypedValue, error) {
+func (c *typeConverter) ObjectToTyped(obj runtime.Object, opts ...typed.ValidationOptions) (*typed.TypedValue, error) {
 	gvk := obj.GetObjectKind().GroupVersionKind()
 	t := c.parser[gvk]
 	if t == nil {
 		return nil, NewNoCorrespondingTypeError(gvk)
 	}
 	switch o := obj.(type) {
 	case *unstructured.Unstructured:
-		return t.FromUnstructured(o.UnstructuredContent())
+		return t.FromUnstructured(o.UnstructuredContent(), opts...)
 	default:
-		return t.FromStructured(obj)
+		return t.FromStructured(obj, opts...)
 	}
 }
 
@@ -84,12 +84,12 @@ func NewDeducedTypeConverter() TypeConverter {
 }
 
 // ObjectToTyped converts an object into a TypedValue with a "deduced type".
-func (deducedTypeConverter) ObjectToTyped(obj runtime.Object) (*typed.TypedValue, error) {
+func (deducedTypeConverter) ObjectToTyped(obj runtime.Object, opts ...typed.ValidationOptions) (*typed.TypedValue, error) {
 	switch o := obj.(type) {
 	case *unstructured.Unstructured:
-		return typed.DeducedParseableType.FromUnstructured(o.UnstructuredContent())
+		return typed.DeducedParseableType.FromUnstructured(o.UnstructuredContent(), opts...)
 	default:
-		return typed.DeducedParseableType.FromStructured(obj)
+		return typed.DeducedParseableType.FromStructured(obj, opts...)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ require (`
`26`	`26`	`k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00`
`27`	`27`	`k8s.io/utils v0.0.0-20230726121419-3b25d923346b`
`28`	`28`	`sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd`
`29`		`- sigs.k8s.io/structured-merge-diff/v4 v4.3.0`
	`29`	`+ sigs.k8s.io/structured-merge-diff/v4 v4.4.1`
`30`	`30`	`sigs.k8s.io/yaml v1.3.0`
`31`	`31`	`)`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ import (`
`25`	`25`	`"k8s.io/apimachinery/pkg/runtime/schema"`
`26`	`26`	`"sigs.k8s.io/structured-merge-diff/v4/fieldpath"`
`27`	`27`	`"sigs.k8s.io/structured-merge-diff/v4/merge"`
	`28`	`+ "sigs.k8s.io/structured-merge-diff/v4/typed"`
`28`	`29`	`)`
`29`	`30`
`30`	`31`	`type structuredMergeManager struct {`
`@@ -95,11 +96,11 @@ func (f *structuredMergeManager) Update(liveObj, newObj runtime.Object, managed`
`95`	`96`	`if err != nil {`
`96`	`97`	`return nil, nil, fmt.Errorf("failed to convert live object (%v) to proper version: %v", objectGVKNN(liveObj), err)`
`97`	`98`	`}`
`98`		`- newObjTyped, err := f.typeConverter.ObjectToTyped(newObjVersioned)`
	`99`	`+ newObjTyped, err := f.typeConverter.ObjectToTyped(newObjVersioned, typed.AllowDuplicates)`
`99`	`100`	`if err != nil {`
`100`	`101`	`return nil, nil, fmt.Errorf("failed to convert new object (%v) to smd typed: %v", objectGVKNN(newObjVersioned), err)`
`101`	`102`	`}`
`102`		`- liveObjTyped, err := f.typeConverter.ObjectToTyped(liveObjVersioned)`
	`103`	`+ liveObjTyped, err := f.typeConverter.ObjectToTyped(liveObjVersioned, typed.AllowDuplicates)`
`103`	`104`	`if err != nil {`
`104`	`105`	`return nil, nil, fmt.Errorf("failed to convert live object (%v) to smd typed: %v", objectGVKNN(liveObjVersioned), err)`
`105`	`106`	`}`
`@@ -139,11 +140,13 @@ func (f *structuredMergeManager) Apply(liveObj, patchObj runtime.Object, managed`
`139`	`140`	`return nil, nil, fmt.Errorf("failed to convert live object (%v) to proper version: %v", objectGVKNN(liveObj), err)`
`140`	`141`	`}`
`141`	`142`
	`143`	`+ // Don't allow duplicates in the applied object.`
`142`	`144`	`patchObjTyped, err := f.typeConverter.ObjectToTyped(patchObj)`
`143`	`145`	`if err != nil {`
`144`	`146`	`return nil, nil, fmt.Errorf("failed to create typed patch object (%v): %v", objectGVKNN(patchObj), err)`
`145`	`147`	`}`
`146`		`- liveObjTyped, err := f.typeConverter.ObjectToTyped(liveObjVersioned)`
	`148`	`+`
	`149`	`+ liveObjTyped, err := f.typeConverter.ObjectToTyped(liveObjVersioned, typed.AllowDuplicates)`
`147`	`150`	`if err != nil {`
`148`	`151`	`return nil, nil, fmt.Errorf("failed to create typed live object (%v): %v", objectGVKNN(liveObjVersioned), err)`
`149`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ import (`
`32`	`32`	`// TypeConverter allows you to convert from runtime.Object to`
`33`	`33`	`// typed.TypedValue and the other way around.`
`34`	`34`	`type TypeConverter interface {`
`35`		`- ObjectToTyped(runtime.Object) (*typed.TypedValue, error)`
	`35`	`+ ObjectToTyped(runtime.Object, ...typed.ValidationOptions) (*typed.TypedValue, error)`
`36`	`36`	`TypedToObject(*typed.TypedValue) (runtime.Object, error)`
`37`	`37`	`}`
`38`	`38`
`@@ -54,17 +54,17 @@ func NewTypeConverter(openapiSpec map[string]*spec.Schema, preserveUnknownFields`
`54`	`54`	`return &typeConverter{parser: tr}, nil`
`55`	`55`	`}`
`56`	`56`
`57`		`-func (c typeConverter) ObjectToTyped(obj runtime.Object) (typed.TypedValue, error) {`
	`57`	`+func (c typeConverter) ObjectToTyped(obj runtime.Object, opts ...typed.ValidationOptions) (typed.TypedValue, error) {`
`58`	`58`	`gvk := obj.GetObjectKind().GroupVersionKind()`
`59`	`59`	`t := c.parser[gvk]`
`60`	`60`	`if t == nil {`
`61`	`61`	`return nil, NewNoCorrespondingTypeError(gvk)`
`62`	`62`	`}`
`63`	`63`	`switch o := obj.(type) {`
`64`	`64`	`case *unstructured.Unstructured:`
`65`		`- return t.FromUnstructured(o.UnstructuredContent())`
	`65`	`+ return t.FromUnstructured(o.UnstructuredContent(), opts...)`
`66`	`66`	`default:`
`67`		`- return t.FromStructured(obj)`
	`67`	`+ return t.FromStructured(obj, opts...)`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`@@ -84,12 +84,12 @@ func NewDeducedTypeConverter() TypeConverter {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`// ObjectToTyped converts an object into a TypedValue with a "deduced type".`
`87`		`-func (deducedTypeConverter) ObjectToTyped(obj runtime.Object) (*typed.TypedValue, error) {`
	`87`	`+func (deducedTypeConverter) ObjectToTyped(obj runtime.Object, opts ...typed.ValidationOptions) (*typed.TypedValue, error) {`
`88`	`88`	`switch o := obj.(type) {`
`89`	`89`	`case *unstructured.Unstructured:`
`90`		`- return typed.DeducedParseableType.FromUnstructured(o.UnstructuredContent())`
	`90`	`+ return typed.DeducedParseableType.FromUnstructured(o.UnstructuredContent(), opts...)`
`91`	`91`	`default:`
`92`		`- return typed.DeducedParseableType.FromStructured(obj)`
	`92`	`+ return typed.DeducedParseableType.FromStructured(obj, opts...)`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`