[release-v1.17] fix: cluster dialer for OCI pusher

cmd/build.go

@@ -386,7 +386,7 @@ func (c buildConfig) clientOptions() ([]fn.Option, error) {
 	if c.Builder == builders.Host {
 		o = append(o,
 			fn.WithBuilder(oci.NewBuilder(builders.Host, c.Verbose)),
-			fn.WithPusher(oci.NewPusher(c.RegistryInsecure, false, c.Verbose)))
+			fn.WithPusher(oci.NewPusher(c.RegistryInsecure, false, c.Verbose, newTransport(c.RegistryInsecure))))
 	} else if c.Builder == builders.Pack {
 		o = append(o,
 			fn.WithBuilder(pack.NewBuilder(

pkg/oci/pusher.go

@@ -2,7 +2,6 @@ package oci
 
 import (
 	"context"
-	"crypto/tls"
 	"fmt"
 	"net/http"
 	"os"
@@ -32,15 +31,21 @@ type Pusher struct {
 
 	updates chan v1.Update
 	done    chan bool
+
+	transport http.RoundTripper
 }
 
-func NewPusher(insecure, anon, verbose bool) *Pusher {
+func NewPusher(insecure, anon, verbose bool, t http.RoundTripper) *Pusher {
+	if t == nil {
+		t = remote.DefaultTransport
+	}
 	return &Pusher{
 		Insecure:  insecure,
 		Anonymous: anon,
 		Verbose:   verbose,
 		updates:   make(chan v1.Update, 10),
 		done:      make(chan bool, 1),
+		transport: t,
 	}
 }
 
@@ -124,14 +129,7 @@ func (p *Pusher) writeIndex(ctx context.Context, ref name.Reference, ii v1.Image
 	oo := []remote.Option{
 		remote.WithContext(ctx),
 		remote.WithProgress(p.updates),
-	}
-
-	if p.Insecure {
-		t := remote.DefaultTransport.(*http.Transport).Clone()
-		t.TLSClientConfig = &tls.Config{
-			InsecureSkipVerify: true,
-		}
-		oo = append(oo, remote.WithTransport(t))
+		remote.WithTransport(p.transport),
 	}
 
 	if !p.Anonymous {

pkg/oci/pusher_test.go

@@ -62,7 +62,7 @@ func TestPusher_Push(t *testing.T) {
 	// Create and push a function
 	client := fn.New(
 		fn.WithBuilder(NewBuilder("", false)),
-		fn.WithPusher(NewPusher(insecure, anon, verbose)))
+		fn.WithPusher(NewPusher(insecure, anon, verbose, nil)))
 
 	f := fn.Function{Root: root, Runtime: "go", Name: "f", Registry: l.Addr().String() + "/funcs"}
 
@@ -127,7 +127,7 @@ func TestPusher_BasicAuth(t *testing.T) {
 	// initialized with an OCI builder and pusher.
 	client := fn.New(
 		fn.WithBuilder(NewBuilder("", verbose)),
-		fn.WithPusher(NewPusher(false, false, verbose)))
+		fn.WithPusher(NewPusher(false, false, verbose, nil)))
 
 	// Function
 	// Built and tagged to push to the mock registry