mirror of
https://github.com/vmware-tanzu/pinniped.git
synced 2026-09-13 11:34:15 +00:00
Refactor tlsconfigutil.CABundle 'getters' to not have 'get' in the name
Co-authored-by: Ryan Richard <richardry@vmware.com>
This commit is contained in:
committed by
Ryan Richard
co-authored by
Ryan Richard
parent
4cf0e46c38
commit
fcceeed9fa
+2
-2
@@ -335,8 +335,8 @@ func (c *gitHubWatcherController) validateUpstreamAndUpdateConditions(ctx contro
|
||||
|
||||
githubConnectionCondition, hostURL, httpClient, githubConnectionErr := c.validateGitHubConnection(
|
||||
hostPort,
|
||||
caBundle.GetCABundle(),
|
||||
caBundle.GetCertPool(),
|
||||
caBundle.PEMBytes(),
|
||||
caBundle.CertPool(),
|
||||
hostCondition.Status == metav1.ConditionTrue,
|
||||
tlsConfigCondition.Status == metav1.ConditionTrue,
|
||||
)
|
||||
|
||||
@@ -359,7 +359,7 @@ func (c *oidcWatcherController) validateIssuer(ctx context.Context, upstream *id
|
||||
// Get the discovered provider and HTTP client from cache, if they are found in the cache.
|
||||
cacheKey := oidcDiscoveryCacheKey{
|
||||
issuer: upstream.Spec.Issuer,
|
||||
caBundleHash: caBundle.GetCABundleHash(), // note that this will always return the same hash for nil input
|
||||
caBundleHash: caBundle.Hash(), // note that this will always return the same hash for nil input
|
||||
}
|
||||
if cacheEntry := c.validatorCache.getProvider(cacheKey); cacheEntry != nil {
|
||||
discoveredProvider = cacheEntry.provider
|
||||
@@ -373,7 +373,7 @@ func (c *oidcWatcherController) validateIssuer(ctx context.Context, upstream *id
|
||||
|
||||
// If the provider does not exist in the cache, do a fresh discovery lookup and save to the cache.
|
||||
if discoveredProvider == nil {
|
||||
httpClient = defaultClientShortTimeout(caBundle.GetCertPool())
|
||||
httpClient = defaultClientShortTimeout(caBundle.CertPool())
|
||||
|
||||
_, issuerURLCondition := validateHTTPSURL(upstream.Spec.Issuer, "issuer", reasonUnreachable)
|
||||
if issuerURLCondition != nil {
|
||||
|
||||
@@ -258,7 +258,7 @@ func ValidateGenericLDAP(
|
||||
tlsSpec := tlsconfigutil.TLSSpecForSupervisor(upstream.Spec().TLSSpec())
|
||||
tlsValidCondition, caBundle := tlsconfigutil.ValidateTLSConfig(tlsSpec, "spec.tls", upstream.Namespace(), secretInformer, configMapInformer)
|
||||
conditions.Append(tlsValidCondition, true)
|
||||
config.CABundle = caBundle.GetCABundle()
|
||||
config.CABundle = caBundle.PEMBytes()
|
||||
|
||||
var ldapConnectionValidCondition, searchBaseFoundCondition *metav1.Condition
|
||||
// No point in trying to connect to the server if the config was already determined to be invalid.
|
||||
|
||||
Reference in New Issue
Block a user