github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-08 04:32:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #115065 from apelisse/apimachinery-managed-fields

Browse Source 
managedfields: Move most of fieldmanager package to managefields
This commit is contained in:
Kubernetes Prow Robot
2023-03-09 21:34:22 -08:00
committed by GitHub
parent 48e4052fc0 4f3859ce91
commit e8ae6658ed
60 changed files with 7562 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
v1validation "k8s.io/apimachinery/pkg/apis/meta/v1/validation"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/managedfields"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager"
@@ -169,7 +170,7 @@ 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.ValidateManagedFields(managedFields); err != nil {
if err := managedfields.ValidateManagedFields(managedFields); err != nil {
return err
}

4
test/integration/apiserver/apply/scale_test.go
View File

@@ -29,7 +29,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager"
"k8s.io/apimachinery/pkg/util/managedfields"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/scheme"
deploymentstorage "k8s.io/kubernetes/pkg/registry/apps/deployment/storage"
@@ -279,7 +279,7 @@ func TestScaleUpdateOnlyStatus(t *testing.T) {
func TestAllKnownVersionsAreInMappings(t *testing.T) {
cases := []struct {
groupKind schema.GroupKind
mappings fieldmanager.ResourcePathMappings
mappings managedfields.ResourcePathMappings
}{
{
groupKind: schema.GroupKind{Group: "apps", Kind: "ReplicaSet"},

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

@@ -29,12 +29,13 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apimachinery/pkg/util/managedfields"
"k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager"
k8stest "k8s.io/kubernetes/pkg/api/testing"
)
func convertToUnstructured(b *testing.B, obj runtime.Object) runtime.Object {
converter := fieldmanager.NewDeducedTypeConverter()
converter := managedfields.NewDeducedTypeConverter()
typed, err := converter.ObjectToTyped(obj)
require.NoError(b, err)
res, err := converter.TypedToObject(typed)