github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 02:11:09 +00:00
Code Issues Projects Releases Wiki Activity

fieldmanager: remove dependencies on internal

Browse Source 
Remove dependencies on internal fieldmanager for admission things. This
is preparing for moving fieldmanager out, but the admission part will
stay here, so it can't depend directly on internal.
This commit is contained in:
Antoine Pelisse 2022-12-21 15:46:49 -08:00
parent 2b69bec35d
commit d13b405307
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/admission.go
View File

@ -22,7 +22,6 @@ import (
"k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/admission"
"k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal"
"k8s.io/apiserver/pkg/warning" "k8s.io/apiserver/pkg/warning"
) )
@ -71,7 +70,7 @@ func (admit *managedFieldsValidatingAdmissionController) Admit(ctx context.Conte
return err return err
} }
managedFieldsAfterAdmission := objectMeta.GetManagedFields() managedFieldsAfterAdmission := objectMeta.GetManagedFields()
if _, err := internal.DecodeManagedFields(managedFieldsAfterAdmission); err != nil { if err := ValidateManagedFields(managedFieldsAfterAdmission); err != nil {
objectMeta.SetManagedFields(managedFieldsBeforeAdmission) objectMeta.SetManagedFields(managedFieldsBeforeAdmission)
warning.AddWarning(ctx, "", warning.AddWarning(ctx, "",
fmt.Sprintf(InvalidManagedFieldsAfterMutatingAdmissionWarningFormat, fmt.Sprintf(InvalidManagedFieldsAfterMutatingAdmissionWarningFormat,

5
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/admission_test.go
View File

@ -27,7 +27,6 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/admission"
"k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager" "k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager"
"k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal"
"sigs.k8s.io/structured-merge-diff/v4/fieldpath" "sigs.k8s.io/structured-merge-diff/v4/fieldpath"
) )
@ -36,7 +35,9 @@ func TestAdmission(t *testing.T) {
ac := fieldmanager.NewManagedFieldsValidatingAdmissionController(wrap) ac := fieldmanager.NewManagedFieldsValidatingAdmissionController(wrap)
now := metav1.Now() now := metav1.Now()
validFieldsV1, err := internal.SetToFields(*fieldpath.NewSet(fieldpath.MakePathOrDie("metadata", "labels", "test-label"))) validFieldsV1 := metav1.FieldsV1{}
var err error
validFieldsV1.Raw, err = fieldpath.NewSet(fieldpath.MakePathOrDie("metadata", "labels", "test-label")).ToJSON()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }