exponential retry on name resolution to registries (#1576)

Signed-off-by: Jordan Keister <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 19a457eec2514421163624a27c5b6a3b24212365

Author: grokspawn

staging/operator-registry/pkg/image/containerdregistry/registry.go

@@ -57,9 +57,26 @@ func (r *Registry) Pull(ctx context.Context, ref image.Reference) error {
 		return err
 	}
 
-	name, root, err := resolver.Resolve(ctx, ref.String())
-	if err != nil {
-		return fmt.Errorf("error resolving name for image ref %s: %v", ref.String(), err)
+	retryBackoff := wait.Backoff{
+		Duration: 1 * time.Second,
+		Factor:   1.0,
+		Jitter:   0.1,
+		Steps:    5,
+	}
+
+	var name string
+	var root ocispec.Descriptor
+	if err := retry.OnError(retryBackoff,
+		func(pullErr error) bool {
+			r.log.Warnf("Error resolving registry %q: %v. Retrying", ref.String(), pullErr)
+			return true
+		},
+		func() error {
+			name, root, err = resolver.Resolve(ctx, ref.String())
+			return err
+		},
+	); err != nil {
+		return fmt.Errorf("error resolving remote name %s: %v", ref.String(), err)
 	}
 	r.log.Debugf("resolved name: %s", name)
 
@@ -68,13 +85,6 @@ func (r *Registry) Pull(ctx context.Context, ref image.Reference) error {
 		return err
 	}
 
-	retryBackoff := wait.Backoff{
-		Duration: 1 * time.Second,
-		Factor:   1.0,
-		Jitter:   0.1,
-		Steps:    5,
-	}
-
 	if err := retry.OnError(retryBackoff,
 		func(pullErr error) bool {
 			if nonRetriablePullError.MatchString(pullErr.Error()) {