mirrors/pinniped
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/pinniped.git synced 2026-09-19 22:44:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

extract some common condition reason string constants

Browse Source
This commit is contained in:
Ryan Richard
2024-08-05 11:32:20 -07:00
parent 4ec5766ea9
commit 414ff503ef
5 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/controller/authenticator/jwtcachefiller/jwtcachefiller.go
+7 -10
View File
@@ -56,9 +56,6 @@ const (
typeJWKSFetchValid = "JWKSFetchValid"
typeAuthenticatorValid = "AuthenticatorValid"
reasonNotReady = "NotReady"
reasonUnableToValidate = "UnableToValidate"
reasonInvalidIssuerURL = "InvalidIssuerURL"
reasonInvalidIssuerURLScheme = "InvalidIssuerURLScheme"
reasonInvalidIssuerURLFragment = "InvalidIssuerURLContainsFragment"
reasonInvalidIssuerURLQueryParams = "InvalidIssuerURLContainsQueryParams"
@@ -322,7 +319,7 @@ func (c *jwtCacheFillerController) validateIssuer(issuer string, conditions []*m
conditions = append(conditions, &metav1.Condition{
Type: typeIssuerURLValid,
Status: metav1.ConditionFalse,
Reason: reasonInvalidIssuerURL,
Reason: conditionsutil.ReasonInvalidIssuerURL,
Message: msg,
})
return nil, conditions, false
@@ -386,7 +383,7 @@ func (c *jwtCacheFillerController) validateProviderDiscovery(ctx context.Context
conditions = append(conditions, &metav1.Condition{
Type: typeDiscoveryValid,
Status: metav1.ConditionUnknown,
Reason: reasonUnableToValidate,
Reason: conditionsutil.ReasonUnableToValidate,
Message: msgUnableToValidate,
})
return nil, nil, conditions, nil
@@ -421,7 +418,7 @@ func (c *jwtCacheFillerController) validateProviderJWKSURL(provider *coreosoidc.
conditions = append(conditions, &metav1.Condition{
Type: typeJWKSURLValid,
Status: metav1.ConditionUnknown,
Reason: reasonUnableToValidate,
Reason: conditionsutil.ReasonUnableToValidate,
Message: msgUnableToValidate,
})
return "", conditions, nil
@@ -484,7 +481,7 @@ func (c *jwtCacheFillerController) validateJWKSFetch(ctx context.Context, jwksUR
conditions = append(conditions, &metav1.Condition{
Type: typeJWKSFetchValid,
Status: metav1.ConditionUnknown,
Reason: reasonUnableToValidate,
Reason: conditionsutil.ReasonUnableToValidate,
Message: msgUnableToValidate,
})
return nil, conditions, nil
@@ -540,7 +537,7 @@ func (c *jwtCacheFillerController) validateJWKSFetch(ctx context.Context, jwksUR
conditions = append(conditions, &metav1.Condition{
Type: typeJWKSFetchValid,
Status: metav1.ConditionUnknown,
Reason: reasonUnableToValidate,
Reason: conditionsutil.ReasonUnableToValidate,
Message: msg,
})
return nil, conditions, fmt.Errorf("%s: %w", errText, verifyWithKeySetErr)
@@ -559,7 +556,7 @@ func (c *jwtCacheFillerController) newCachedJWTAuthenticator(
conditions = append(conditions, &metav1.Condition{
Type: typeAuthenticatorValid,
Status: metav1.ConditionUnknown,
Reason: reasonUnableToValidate,
Reason: conditionsutil.ReasonUnableToValidate,
Message: msgUnableToValidate,
})
return nil, conditions, nil
@@ -641,7 +638,7 @@ func (c *jwtCacheFillerController) updateStatus(
conditions = append(conditions, &metav1.Condition{
Type: typeReady,
Status: metav1.ConditionFalse,
Reason: reasonNotReady,
Reason: conditionsutil.ReasonNotReady,
Message: "the JWTAuthenticator is not ready: see other conditions for details",
})
} else {
internal/controller/authenticator/webhookcachefiller/webhookcachefiller.go
+4 -7
View File
@@ -50,13 +50,10 @@ const (
typeEndpointURLValid = "EndpointURLValid"
typeAuthenticatorValid = "AuthenticatorValid"
reasonNotReady = "NotReady"
reasonUnableToValidate = "UnableToValidate"
reasonUnableToCreateClient = "UnableToCreateClient"
reasonUnableToInstantiateWebhook = "UnableToInstantiateWebhook"
reasonInvalidEndpointURL = "InvalidEndpointURL"
reasonInvalidEndpointURLScheme = "InvalidEndpointURLScheme"
reasonUnableToDialServer = "UnableToDialServer"
msgUnableToValidate = "unable to validate; see other conditions for details"
)
@@ -252,7 +249,7 @@ func newWebhookAuthenticator(
conditions = append(conditions, &metav1.Condition{
Type: typeAuthenticatorValid,
Status: metav1.ConditionUnknown,
Reason: reasonUnableToValidate,
Reason: conditionsutil.ReasonUnableToValidate,
Message: msgUnableToValidate,
})
return nil, conditions, nil
@@ -324,7 +321,7 @@ func (c *webhookCacheFillerController) validateConnection(certPool *x509.CertPoo
conditions = append(conditions, &metav1.Condition{
Type: typeWebhookConnectionValid,
Status: metav1.ConditionUnknown,
Reason: reasonUnableToValidate,
Reason: conditionsutil.ReasonUnableToValidate,
Message: msgUnableToValidate,
})
return conditions, nil
@@ -338,7 +335,7 @@ func (c *webhookCacheFillerController) validateConnection(certPool *x509.CertPoo
conditions = append(conditions, &metav1.Condition{
Type: typeWebhookConnectionValid,
Status: metav1.ConditionFalse,
Reason: reasonUnableToDialServer,
Reason: conditionsutil.ReasonUnableToDialServer,
Message: msg,
})
return conditions, fmt.Errorf("%s: %w", errText, err)
@@ -418,7 +415,7 @@ func (c *webhookCacheFillerController) updateStatus(
conditions = append(conditions, &metav1.Condition{
Type: typeReady,
Status: metav1.ConditionFalse,
Reason: reasonNotReady,
Reason: conditionsutil.ReasonNotReady,
Message: "the WebhookAuthenticator is not ready: see other conditions for details",
})
} else {