Fix custom CA bundle resolution (#296)

* add different resolver for CA bundles

* remove commented out CaBundleResolver in resolverChain

Author: mozesl-nokia

pkg/apiserver/apiserver.go

@@ -212,11 +212,11 @@ func (c completedConfig) New(ctx context.Context) (*PorchServer, error) {
 	resolverChain := []porch.Resolver{
 		porch.NewBasicAuthResolver(),
 		porch.NewBearerTokenAuthResolver(),
-		porch.NewCaBundleResolver(),
 		porch.NewGcloudWIResolver(coreV1Client, stsClient),
 	}
 
 	credentialResolver := porch.NewCredentialResolver(coreClient, resolverChain)
+	caBundleResolver := porch.NewCredentialResolver(coreClient, []porch.Resolver{porch.NewCaBundleResolver()})
 	referenceResolver := porch.NewReferenceResolver(coreClient)
 	userInfoProvider := &porch.ApiserverUserInfoProvider{}
 
@@ -225,6 +225,7 @@ func (c completedConfig) New(ctx context.Context) (*PorchServer, error) {
 	c.ExtraConfig.CacheOptions.CoreClient = coreClient
 	c.ExtraConfig.CacheOptions.RepoPRChangeNotifier = watcherMgr
 	c.ExtraConfig.CacheOptions.ExternalRepoOptions.CredentialResolver = credentialResolver
+	c.ExtraConfig.CacheOptions.ExternalRepoOptions.CaBundleResolver = caBundleResolver
 	c.ExtraConfig.CacheOptions.ExternalRepoOptions.UserInfoProvider = userInfoProvider
 
 	cacheImpl, err := cache.GetCacheImpl(ctx, c.ExtraConfig.CacheOptions)

pkg/externalrepo/git/git.go

@@ -196,8 +196,8 @@ func OpenRepository(ctx context.Context, name, namespace string, spec *configapi
 		deployment:         deployment,
 	}
 
-	if opts.ExternalRepoOptions.UseUserDefinedCaBundle {
-		if caBundle, err := opts.ExternalRepoOptions.CredentialResolver.ResolveCredential(ctx, namespace, namespace+"-ca-bundle"); err != nil {
+	if opts.UseUserDefinedCaBundle && opts.CaBundleResolver != nil {
+		if caBundle, err := opts.CaBundleResolver.ResolveCredential(ctx, namespace, namespace+"-ca-bundle"); err != nil {
 			klog.Errorf("failed to obtain caBundle from secret %s/%s: %v", namespace, namespace+"-ca-bundle", err)
 		} else {
 			repository.caBundle = []byte(caBundle.ToString())

pkg/externalrepo/types/externalrepotypes.go

@@ -29,5 +29,6 @@ type ExternalRepoOptions struct {
 	LocalDirectory         string
 	UseUserDefinedCaBundle bool
 	CredentialResolver     repository.CredentialResolver
+	CaBundleResolver       repository.CredentialResolver
 	UserInfoProvider       repository.UserInfoProvider
 }