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

Remove retry in TestSubresourcePatch

Browse Source
This commit is contained in:
Kevin Delgado 2021-03-10 19:41:41 +00:00
parent be419673a2
commit 767dcccb45
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
staging/src/k8s.io/apiextensions-apiserver/test/integration/subresources_test.go
View File

@ -24,6 +24,7 @@ import (
"sort" "sort"
"strings" "strings"
"testing" "testing"
"time"
autoscaling "k8s.io/api/autoscaling/v1" autoscaling "k8s.io/api/autoscaling/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
@ -733,21 +734,12 @@ func TestSubresourcePatch(t *testing.T) {
expectInt64(t, patchedNoxuInstance.UnstructuredContent(), 999, "status", "num") // .status.num should be 999 expectInt64(t, patchedNoxuInstance.UnstructuredContent(), 999, "status", "num") // .status.num should be 999
expectInt64(t, patchedNoxuInstance.UnstructuredContent(), 10, "spec", "num") // .spec.num should remain 10 expectInt64(t, patchedNoxuInstance.UnstructuredContent(), 10, "spec", "num") // .spec.num should remain 10
// server-side-apply increments resouceVersion if the resource is unchanged for 1 second after the previous write,
// and by waiting a second we ensure that resourceVersion will be updated if the no-op patch increments resourceVersion
time.Sleep(time.Second)
// no-op patch // no-op patch
rv := "" rv := patchedNoxuInstance.GetResourceVersion()
found := false found := false
// TODO: remove this retry once http://issue.k8s.io/75564 is resolved, and expect the resourceVersion to remain unchanged 100% of the time.
// server-side-apply incorrectly considers spec fields in patches submitted to /status when updating managedFields timestamps, so this patch is racy:
// if it spans a 1-second boundary from the last write, server-side-apply updates the managedField timestamp and increments resourceVersion.
for i := 0; i < 10; i++ {
rv, found, err = unstructured.NestedString(patchedNoxuInstance.UnstructuredContent(), "metadata", "resourceVersion")
if err != nil {
t.Fatal(err)
}
if !found {
t.Fatalf("metadata.resourceVersion not found")
}
t.Logf("Patching .status.num again to 999") t.Logf("Patching .status.num again to 999")
patchedNoxuInstance, err = noxuResourceClient.Patch(context.TODO(), "foo", types.MergePatchType, patch, metav1.PatchOptions{}, "status") patchedNoxuInstance, err = noxuResourceClient.Patch(context.TODO(), "foo", types.MergePatchType, patch, metav1.PatchOptions{}, "status")
if err != nil { if err != nil {
@ -756,11 +748,6 @@ func TestSubresourcePatch(t *testing.T) {
// make sure no-op patch does not increment resourceVersion // make sure no-op patch does not increment resourceVersion
expectInt64(t, patchedNoxuInstance.UnstructuredContent(), 999, "status", "num") expectInt64(t, patchedNoxuInstance.UnstructuredContent(), 999, "status", "num")
expectInt64(t, patchedNoxuInstance.UnstructuredContent(), 10, "spec", "num") expectInt64(t, patchedNoxuInstance.UnstructuredContent(), 10, "spec", "num")
if patchedNoxuInstance.GetResourceVersion() == rv {
break
}
t.Logf("resource version changed - retrying")
}
expectString(t, patchedNoxuInstance.UnstructuredContent(), rv, "metadata", "resourceVersion") expectString(t, patchedNoxuInstance.UnstructuredContent(), rv, "metadata", "resourceVersion")
// empty patch // empty patch