Merge pull request #31192 from thaJeztah/warn-instead-of-error

don't log v2 pull as error when retrying

distribution/pull.go

@@ -140,7 +140,7 @@ func Pull(ctx context.Context, ref reference.Named, imagePullConfig *ImagePullCo
 					// append subsequent errors
 					lastErr = err
 				}
-				logrus.Errorf("Attempting next endpoint for pull after error: %v", err)
+				logrus.Infof("Attempting next endpoint for pull after error: %v", err)
 				continue
 			}
 			logrus.Errorf("Not continuing with pull after error: %v", err)

distribution/pull_v2.go

@@ -73,7 +73,6 @@ func (p *v2Puller) Pull(ctx context.Context, ref reference.Named) (err error) {
 			return err
 		}
 		if continueOnError(err) {
-			logrus.Errorf("Error trying v2 registry: %v", err)
 			return fallbackError{
 				err:         err,
 				confirmedV2: p.confirmedV2,

distribution/push.go

@@ -126,7 +126,7 @@ func Push(ctx context.Context, ref reference.Named, imagePushConfig *ImagePushCo
 					}
 					err = fallbackErr.err
 					lastErr = err
-					logrus.Errorf("Attempting next endpoint for push after error: %v", err)
+					logrus.Infof("Attempting next endpoint for push after error: %v", err)
 					continue
 				}
 			}