Remove overwriting the default HTTP transport

docs/content/en/docs/5_architecture_and_components/function-runner/functionality/image-registry-management.md

@@ -207,7 +207,7 @@ The Function Runner supports custom TLS certificates for secure registry connect
 
 **Certificate loading:**
 - Reads from mounted secret path
-- Supports ca.crt or ca.pem filenames
+- Supports common certificate filenames
 - Parses PEM-encoded certificates
 - Creates certificate pool with custom CA
 

docs/content/en/docs/6_configuration_and_deployments/configurations/components/function-runner-config/private-registries-config.md

@@ -125,7 +125,12 @@ type: kubernetes.io/tls
 ```
 
 {{% alert title="Note" color="primary" %}}
-The certificate must be in PEM format and the key must be named `ca.crt` or `ca.pem`.
+The certificate must be in PEM format and the key must be named one of the following:
+- `ca.crt`
+- `ca.pem`
+- `cacert.pem`
+- `ca-bundle.crt`
+- `root.crt`
 {{% /alert %}}
 
 ### 2. Mount TLS Secret

func/internal/executableevaluator_test.go

@@ -35,6 +35,7 @@ const (
 	defaultKRMImagePrefix = "ghcr.io/kptdev/krm-functions-catalog/"
 	setImageFunction      = "set-image"
 	starlarkFunction      = "starlark"
+	testImageName         = "test-image"
 )
 
 func getFunctionConfigStore(binaryDir string) *reconciler.FunctionConfigStore {

func/internal/podevaluator.go

@@ -20,7 +20,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/kptdev/kpt/pkg/fn/runtime"
 	"github.com/kptdev/kpt/pkg/lib/runneroptions"
 	fnconf "github.com/kptdev/porch/controllers/functionconfigs/reconciler"
 	"github.com/kptdev/porch/func/evaluator"
@@ -136,40 +135,44 @@ func NewPodEvaluator(ctx context.Context, o PodEvaluatorOptions, cl client.Clien
 	readyCh := make(chan *podReadyResponse, channelBufferSize)
 	evictCh := make(chan *podEvictionRequest, channelBufferSize)
 
+	podMgr := &podManager{
+		kubeClient:         cl,
+		namespace:          o.PodNamespace,
+		wrapperServerImage: o.WrapperServerImage,
+		podReadyCh:         readyCh,
+		podReadyTimeout:    60 * time.Second,
+		managerNamespace:   managerNs,
+		maxGrpcMessageSize: o.MaxGrpcMessageSize,
+
+		enablePrivateRegistries:    o.EnablePrivateRegistries,
+		registryAuthSecretPath:     o.RegistryAuthSecretPath,
+		registryAuthSecretName:     o.RegistryAuthSecretName,
+		enablePrivateRegistriesTls: o.EnablePrivateRegistriesTls,
+		tlsSecretPath:              o.TlsSecretPath,
+		imageResolver:              runneroptions.ResolveToImageForCLIFunc(o.DefaultImagePrefix),
+	}
+
+	pcm := &podCacheManager{
+		gcScanInterval:             o.GcScanInterval,
+		podTTL:                     o.PodTTL,
+		connectionRequestCh:        reqCh,
+		podReadyCh:                 readyCh,
+		evictionCh:                 evictCh,
+		functions:                  map[string]*functionInfo{},
+		maxWaitlistLength:          maxWaitlist,
+		maxParallelPodsPerFunction: maxPods,
+		functionConfigMap:          functionConfigStore,
+
+		podManager: podMgr,
+	}
+
 	pe := &podEvaluator{
-		requestCh:      reqCh,
-		evictionCh:     evictCh,
-		maxGrpcRetries: maxRetries,
-		podCacheManager: &podCacheManager{
-			gcScanInterval:             o.GcScanInterval,
-			podTTL:                     o.PodTTL,
-			connectionRequestCh:        reqCh,
-			podReadyCh:                 readyCh,
-			evictionCh:                 evictCh,
-			functions:                  map[string]*functionInfo{},
-			maxWaitlistLength:          maxWaitlist,
-			maxParallelPodsPerFunction: maxPods,
-			functionConfigMap:          functionConfigStore,
-
-			podManager: &podManager{
-				kubeClient:         cl,
-				namespace:          o.PodNamespace,
-				wrapperServerImage: o.WrapperServerImage,
-				podReadyCh:         readyCh,
-				podReadyTimeout:    60 * time.Second,
-				managerNamespace:   managerNs,
-				maxGrpcMessageSize: o.MaxGrpcMessageSize,
-
-				enablePrivateRegistries:    o.EnablePrivateRegistries,
-				registryAuthSecretPath:     o.RegistryAuthSecretPath,
-				registryAuthSecretName:     o.RegistryAuthSecretName,
-				enablePrivateRegistriesTls: o.EnablePrivateRegistriesTls,
-				tlsSecretPath:              o.TlsSecretPath,
-				imageResolver:              runneroptions.ResolveToImageForCLIFunc(o.DefaultImagePrefix),
-				tagResolver:                runtime.TagResolver{},
-			},
-		},
+		requestCh:       reqCh,
+		evictionCh:      evictCh,
+		maxGrpcRetries:  maxRetries,
+		podCacheManager: pcm,
 	}
+
 	go pe.podCacheManager.podCacheManager(ctx)
 
 	err = pe.podCacheManager.retrieveFunctionPods(context.Background())
@@ -191,17 +194,9 @@ func NewPodEvaluator(ctx context.Context, o PodEvaluatorOptions, cl client.Clien
 
 func (pe *podEvaluator) EvaluateFunction(ctx context.Context, req *evaluator.EvaluateFunctionRequest) (*evaluator.EvaluateFunctionResponse, error) {
 	starttime := time.Now()
-	var image string
 	defer func() {
 		klog.Infof("evaluating %v in pod took %v", req.Image, time.Since(starttime))
 	}()
-	tagResolver := pe.podCacheManager.podManager.tagResolver
-	var err error
-	image, err = tagResolver.ResolveFunctionImage(ctx, req.Image, req.Tag)
-	if err != nil {
-		return nil, fmt.Errorf("failed to resolve tag for image %q with constraint %q: %w", req.Image, req.Tag, err)
-	}
-	req.Image = image
 
 	maxRetries := pe.maxGrpcRetries
 	var lastErr error