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

fix test

Browse Source
This commit is contained in:
Kevin Wiesmueller 2021-02-11 16:11:20 +01:00
parent ffbae9c5b4
commit 711f2dab47
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,7 +114,7 @@ func TestMutatingWebhookResetsInvalidManagedFields(t *testing.T) {
}() }()
var pod *corev1.Pod var pod *corev1.Pod
var lastErr string var lastErr error
// TODO(kwiesmueller): define warning format in the apiserver and use here // TODO(kwiesmueller): define warning format in the apiserver and use here
// expectedWarning := fieldmanager.InvalidManagedFieldsAfterMutatingAdmissionWarningFormat // expectedWarning := fieldmanager.InvalidManagedFieldsAfterMutatingAdmissionWarningFormat
@ -135,13 +135,16 @@ func TestMutatingWebhookResetsInvalidManagedFields(t *testing.T) {
// return false, nil // return false, nil
// } // }
if err := expectValidManagedFields(pod.ManagedFields); err != nil { if err := expectValidManagedFields(pod.ManagedFields); err != nil {
lastErr = err.Error() lastErr = err
return false, nil return false, nil
} }
return true, nil return true, nil
}); err != nil { }); err != nil {
t.Fatalf("failed to wait for apiserver handling webhook mutation: %v, last error: %v", err, lastErr) t.Fatalf("failed to wait for apiserver handling webhook mutation: %v, last error: %v", err, lastErr)
} }
if lastErr != nil {
t.Fatal(lastErr)
}
// if warningWriter.WarningCount() != 1 { // if warningWriter.WarningCount() != 1 {
// t.Errorf("expected one warning, got: %v", warningWriter.WarningCount()) // t.Errorf("expected one warning, got: %v", warningWriter.WarningCount())
// } // }
@ -215,7 +218,11 @@ func newInvalidManagedFieldsWebhookHandler(t *testing.T) http.Handler {
if len(pod.ManagedFields) != 0 { if len(pod.ManagedFields) != 0 {
t.Logf("corrupting managedFields %v", pod.ManagedFields) t.Logf("corrupting managedFields %v", pod.ManagedFields)
review.Response.Patch = []byte(`[{"op":"remove","path":"/metadata/managedFields/0/apiVersion"},{"op":"remove","path":"/metadata/managedFields/0/fieldsType"}]`) review.Response.Patch = []byte(`[
{"op":"remove","path":"/metadata/managedFields/0/apiVersion"},
{"op":"remove","path":"/metadata/managedFields/0/fieldsV1"},
{"op":"remove","path":"/metadata/managedFields/0/fieldsType"}
]`)
jsonPatch := v1.PatchTypeJSONPatch jsonPatch := v1.PatchTypeJSONPatch
review.Response.PatchType = &jsonPatch review.Response.PatchType = &jsonPatch
} }