github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #114868 from apelisse/private-internal-managers

Browse Source 
fieldmanager: Make internal managers private
This commit is contained in:
Kubernetes Prow Robot
2023-01-10 16:33:19 -08:00
committed by GitHub
parent cf81822d38 ad65b25cc3
commit 7e97b4b322
29 changed files with 597 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/integration/apiserver/admissionwebhook/invalid_managedFields_test.go
View File

@@ -169,8 +169,9 @@ func TestMutatingWebhookResetsInvalidManagedFields(t *testing.T) {
// validate against both decoding and validation to make sure we use the hardest rule between the both to reset
// with decoding being as strict as it gets, only using it should be enough in admission
func validateManagedFieldsAndDecode(managedFields []metav1.ManagedFieldsEntry) error {
if _, err := fieldmanager.DecodeManagedFields(managedFields); err != nil {
if err := fieldmanager.ValidateManagedFields(managedFields); err != nil {
return err
}
validationErrs := v1validation.ValidateManagedFields(managedFields, field.NewPath("metadata").Child("managedFields"))
return validationErrs.ToAggregate()

2
test/integration/apiserver/timestamp_transformer_test.go
View File

@@ -34,7 +34,7 @@ import (
)
func convertToUnstructured(b *testing.B, obj runtime.Object) runtime.Object {
converter := fieldmanager.DeducedTypeConverter{}
converter := fieldmanager.NewDeducedTypeConverter()
typed, err := converter.ObjectToTyped(obj)
require.NoError(b, err)
res, err := converter.TypedToObject(typed)