make CRD storage version update always retry

kubernetes · Feb 18, 2021 · 100aa3b · 100aa3b
1 parent 6ddc1eb
commit 100aa3b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/storageversion/manager.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/storageversion/manager.go
@@ -269,5 +269,6 @@ func (m *manager) updateCRDStorageVersion(ctx context.Context, crd *apiextension
 		gr,
 		encodingVersion,
 		decodableVersions,
-		appendOwnerRefFunc)
+		appendOwnerRefFunc,
+		true)
 }
diff --git a/staging/src/k8s.io/apiserver/pkg/storageversion/manager.go b/staging/src/k8s.io/apiserver/pkg/storageversion/manager.go
@@ -140,7 +140,7 @@ func (s *defaultManager) UpdateStorageVersions(kubeAPIServerClientConfig *rest.C
 		if len(gr.Group) == 0 {
 			gr.Group = "core"
 		}
-		if err := UpdateStorageVersionFor(context.TODO(), sc, serverID, gr, r.EncodingVersion, dv, nil); err != nil {
+		if err := UpdateStorageVersionFor(context.TODO(), sc, serverID, gr, r.EncodingVersion, dv, nil, false); err != nil {
 			utilruntime.HandleError(fmt.Errorf("failed to update storage version for %v: %v", r.GroupResource, err))
 			s.recordStatusFailure(&r, err)
 			hasFailure = true

diff --git a/staging/src/k8s.io/apiserver/pkg/storageversion/updater.go b/staging/src/k8s.io/apiserver/pkg/storageversion/updater.go
@@ -129,11 +129,11 @@ func setStatusCondition(conditions *[]v1alpha1.StorageVersionCondition, newCondi
 // calulation is finished, and before the client sends the create/update request.
 // It allows the caller to customizes the storage version object, e.g. setting
 // an owner reference.
-func UpdateStorageVersionFor(ctx context.Context, c Client, apiserverID string, gr schema.GroupResource, encodingVersion string, decodableVersions []string, postProcessFunc processStorageVersionFunc) error {
+func UpdateStorageVersionFor(ctx context.Context, c Client, apiserverID string, gr schema.GroupResource, encodingVersion string, decodableVersions []string, postProcessFunc processStorageVersionFunc, alwaysRetry bool) error {
 	retries := 3
 	var retry int
 	var err error
-	for retry < retries {
+	for {
 		select {
 		case <-ctx.Done():
 			return ctx.Err()
@@ -153,6 +153,9 @@ func UpdateStorageVersionFor(ctx context.Context, c Client, apiserverID string,
 			retry++
 			time.Sleep(1 * time.Second)
 		}
+		if !alwaysRetry && retry >= retries {
+			break
+		}
 	}
 	return err
 }