Allow pushing a manifest to a registry with self-signed TLS certificate

cli/registry/client/client.go

@@ -100,27 +100,36 @@ func (c *client) MountBlob(ctx context.Context, sourceRef reference.Canonical, t
 
 // PutManifest sends the manifest to a registry and returns the new digest
 func (c *client) PutManifest(ctx context.Context, ref reference.Named, manifest distribution.Manifest) (digest.Digest, error) {
-	repoEndpoint, err := newDefaultRepositoryEndpoint(ref, c.insecureRegistry)
-	if err != nil {
-		return digest.Digest(""), err
-	}
+	var dgst digest.Digest
+	put := func(ctx context.Context, repo distribution.Repository, ref reference.Named) (bool, error) {
+		manifestService, err := repo.Manifests(ctx)
+		if err != nil {
+			return false, err
+		}
 
-	repo, err := c.getRepositoryForReference(ctx, ref, repoEndpoint)
-	if err != nil {
-		return digest.Digest(""), err
+		_, opts, err := getManifestOptionsFromReference(ref)
+		if err != nil {
+			return false, err
+		}
+
+		dgst, err = manifestService.Put(ctx, manifest, opts...)
+		if err != nil {
+			return false, err
+		}
+
+		return true, nil
 	}
 
-	manifestService, err := repo.Manifests(ctx)
+	registryService, err := registryService(ref, c.insecureRegistry)
 	if err != nil {
 		return digest.Digest(""), err
 	}
 
-	_, opts, err := getManifestOptionsFromReference(ref)
+	err = c.iterateEndpoints(ctx, ref, registryService.LookupPushEndpoints, put)
 	if err != nil {
 		return digest.Digest(""), err
 	}
 
-	dgst, err := manifestService.Put(ctx, manifest, opts...)
 	return dgst, errors.Wrapf(err, "failed to put manifest %s", ref)
 }
 
@@ -169,7 +178,12 @@ func (c *client) GetManifest(ctx context.Context, ref reference.Named) (manifest
 		return result.Ref != nil, err
 	}
 
-	err := c.iterateEndpoints(ctx, ref, fetch)
+	registryService, err := registryService(ref, c.insecureRegistry)
+	if err != nil {
+		return result, err
+	}
+
+	err = c.iterateEndpoints(ctx, ref, registryService.LookupPullEndpoints, fetch)
 	return result, err
 }
 
@@ -182,7 +196,12 @@ func (c *client) GetManifestList(ctx context.Context, ref reference.Named) ([]ma
 		return len(result) > 0, err
 	}
 
-	err := c.iterateEndpoints(ctx, ref, fetch)
+	registryService, err := registryService(ref, c.insecureRegistry)
+	if err != nil {
+		return result, err
+	}
+
+	err = c.iterateEndpoints(ctx, ref, registryService.LookupPullEndpoints, fetch)
 	return result, err
 }
 

cli/registry/client/fetcher.go

@@ -199,8 +199,12 @@ func continueOnError(err error) bool {
 	return false
 }
 
-func (c *client) iterateEndpoints(ctx context.Context, namedRef reference.Named, each func(context.Context, distribution.Repository, reference.Named) (bool, error)) error {
-	endpoints, err := allEndpoints(namedRef, c.insecureRegistry)
+func (c *client) iterateEndpoints(
+	ctx context.Context,
+	namedRef reference.Named,
+	lookup func(hostname string) (endpoints []registry.APIEndpoint, err error),
+	each func(context.Context, distribution.Repository, reference.Named) (bool, error)) error {
+	endpoints, err := lookup(reference.Domain(namedRef))
 	if err != nil {
 		return err
 	}
@@ -261,27 +265,6 @@ func (c *client) iterateEndpoints(ctx context.Context, namedRef reference.Named,
 	return newNotFoundError(namedRef.String())
 }
 
-// allEndpoints returns a list of endpoints ordered by priority (v2, https, v1).
-func allEndpoints(namedRef reference.Named, insecure bool) ([]registry.APIEndpoint, error) {
-	repoInfo, err := registry.ParseRepositoryInfo(namedRef)
-	if err != nil {
-		return nil, err
-	}
-
-	var serviceOpts registry.ServiceOptions
-	if insecure {
-		logrus.Debugf("allowing insecure registry for: %s", reference.Domain(namedRef))
-		serviceOpts.InsecureRegistries = []string{reference.Domain(namedRef)}
-	}
-	registryService, err := registry.NewService(serviceOpts)
-	if err != nil {
-		return []registry.APIEndpoint{}, err
-	}
-	endpoints, err := registryService.LookupPullEndpoints(reference.Domain(repoInfo.Name))
-	logrus.Debugf("endpoints for %s: %v", namedRef, endpoints)
-	return endpoints, err
-}
-
 type notFoundError struct {
 	object string
 }
@@ -306,3 +289,17 @@ func IsNotFound(err error) bool {
 type notFound interface {
 	NotFound()
 }
+
+func registryService(namedRef reference.Named, insecure bool) (registry.Service, error) {
+	var serviceOpts registry.ServiceOptions
+	if insecure {
+		logrus.Debugf("allowing insecure registry for: %s", reference.Domain(namedRef))
+		serviceOpts.InsecureRegistries = []string{reference.Domain(namedRef)}
+	}
+	registryService, err := registry.NewService(serviceOpts)
+	if err != nil {
+		return nil, err
+	}
+
+	return registryService, nil
+}