mirrors/pinniped
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/pinniped.git synced 2026-01-07 14:05:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move conditions reason Success to conditions_util

Browse Source
This commit is contained in:
Joshua Casey
2024-07-22 10:53:03 -05:00
committed by Ryan Richard
parent 920b519ebf
commit 2d5943b21a
4 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/controller/authenticator/jwtcachefiller/jwtcachefiller.go
View File

@@ -56,7 +56,6 @@ const (
typeJWKSFetchValid = "JWKSFetchValid"
typeAuthenticatorValid = "AuthenticatorValid"
reasonSuccess = "Success"
reasonNotReady = "NotReady"
reasonUnableToValidate = "UnableToValidate"
reasonInvalidIssuerURL = "InvalidIssuerURL"
@@ -376,7 +375,7 @@ func (c *jwtCacheFillerController) validateIssuer(issuer string, conditions []*m
conditions = append(conditions, &metav1.Condition{
Type: typeIssuerURLValid,
Status: metav1.ConditionTrue,
Reason: reasonSuccess,
Reason: conditionsutil.ReasonSuccess,
Message: "issuer is a valid URL",
})
return issuerURL, conditions, true
@@ -411,7 +410,7 @@ func (c *jwtCacheFillerController) validateProviderDiscovery(ctx context.Context
conditions = append(conditions, &metav1.Condition{
Type: typeDiscoveryValid,
Status: metav1.ConditionTrue,
Reason: reasonSuccess,
Reason: conditionsutil.ReasonSuccess,
Message: msg,
})
return pJSON, provider, conditions, nil
@@ -470,7 +469,7 @@ func (c *jwtCacheFillerController) validateProviderJWKSURL(provider *coreosoidc.
conditions = append(conditions, &metav1.Condition{
Type: typeJWKSURLValid,
Status: metav1.ConditionTrue,
Reason: reasonSuccess,
Reason: conditionsutil.ReasonSuccess,
Message: "jwks_uri is a valid URL",
})
return pJSON.JWKSURL, conditions, nil
@@ -529,7 +528,7 @@ func (c *jwtCacheFillerController) validateJWKSFetch(ctx context.Context, jwksUR
conditions = append(conditions, &metav1.Condition{
Type: typeJWKSFetchValid,
Status: metav1.ConditionTrue,
Reason: reasonSuccess,
Reason: conditionsutil.ReasonSuccess,
Message: "successfully fetched jwks",
})
return keySet, conditions, nil
@@ -619,7 +618,7 @@ func (c *jwtCacheFillerController) newCachedJWTAuthenticator(
conditions = append(conditions, &metav1.Condition{
Type: typeAuthenticatorValid,
Status: metav1.ConditionTrue,
Reason: reasonSuccess,
Reason: conditionsutil.ReasonSuccess,
Message: msg,
})
return &cachedJWTAuthenticator{
@@ -650,7 +649,7 @@ func (c *jwtCacheFillerController) updateStatus(
conditions = append(conditions, &metav1.Condition{
Type: typeReady,
Status: metav1.ConditionTrue,
Reason: reasonSuccess,
Reason: conditionsutil.ReasonSuccess,
Message: "the JWTAuthenticator is ready",
})
}

9
internal/controller/authenticator/webhookcachefiller/webhookcachefiller.go
View File

@@ -47,7 +47,6 @@ const (
typeWebhookConnectionValid = "WebhookConnectionValid"
typeEndpointURLValid = "EndpointURLValid"
typeAuthenticatorValid = "AuthenticatorValid"
reasonSuccess = "Success"
reasonNotReady = "NotReady"
reasonUnableToValidate = "UnableToValidate"
reasonUnableToCreateClient = "UnableToCreateClient"
@@ -291,7 +290,7 @@ func newWebhookAuthenticator(
conditions = append(conditions, &metav1.Condition{
Type: typeAuthenticatorValid,
Status: metav1.ConditionTrue,
Reason: reasonSuccess,
Reason: conditionsutil.ReasonSuccess,
Message: msg,
})
@@ -333,7 +332,7 @@ func (c *webhookCacheFillerController) validateConnection(certPool *x509.CertPoo
conditions = append(conditions, &metav1.Condition{
Type: typeWebhookConnectionValid,
Status: metav1.ConditionTrue,
Reason: reasonSuccess,
Reason: conditionsutil.ReasonSuccess,
Message: "successfully dialed webhook server",
})
return conditions, nil
@@ -391,7 +390,7 @@ func (c *webhookCacheFillerController) validateEndpoint(endpoint string, conditi
conditions = append(conditions, &metav1.Condition{
Type: typeEndpointURLValid,
Status: metav1.ConditionTrue,
Reason: reasonSuccess,
Reason: conditionsutil.ReasonSuccess,
Message: "spec.endpoint is a valid URL",
})
return &endpointHostPort, conditions, true
@@ -417,7 +416,7 @@ func (c *webhookCacheFillerController) updateStatus(
conditions = append(conditions, &metav1.Condition{
Type: typeReady,
Status: metav1.ConditionTrue,
Reason: reasonSuccess,
Reason: conditionsutil.ReasonSuccess,
Message: "the WebhookAuthenticator is ready",
})
}