oidcsetup: move 'OIDCClientConfig' handling to top-level sync

stlaz · stlaz · commit 3637454262d9 · 2024-02-12T13:55:08.000+01:00
diff --git a/pkg/console/controllers/oidcsetup/oidcsetup.go b/pkg/console/controllers/oidcsetup/oidcsetup.go
@@ -107,9 +107,12 @@ func (c *oidcSetupController) sync(ctx context.Context, syncCtx factory.SyncCont
 
 	if authnConfig.Spec.Type == configv1.AuthenticationTypeOIDC {
 		err = c.syncAuthTypeOIDC(ctx, syncCtx, statusHandler, operatorConfig, authnConfig)
+		statusHandler.AddConditions(status.HandleProgressingOrDegraded("OIDCClientConfig", "MissingID", err))
 		if err != nil {
 			return statusHandler.FlushAndReturn(err)
 		}
+	} else {
+		statusHandler.AddConditions(status.HandleProgressingOrDegraded("OIDCClientConfig", "", nil))
 	}
 
 	oidcClientsSchema, err := authnConfigHasOIDCFields(c.crdLister)
@@ -144,9 +147,7 @@ func (c *oidcSetupController) syncAuthTypeOIDC(
 	}
 
 	if len(clientConfig.ClientID) == 0 {
-		err := fmt.Errorf("no ID set on OIDC client")
-		statusHandler.AddConditions(status.HandleProgressingOrDegraded("OIDCClientConfig", "MissingID", err))
-		return statusHandler.FlushAndReturn(err)
+		return fmt.Errorf("no ID set on console's OIDC client")
 	}
 	c.authStatusHandler.WithCurrentOIDCClient(clientConfig.ClientID)
 

Original file line number	Diff line number	Diff line change
`@@ -107,9 +107,12 @@ func (c *oidcSetupController) sync(ctx context.Context, syncCtx factory.SyncCont`
`107`	`107`
`108`	`108`	`if authnConfig.Spec.Type == configv1.AuthenticationTypeOIDC {`
`109`	`109`	`err = c.syncAuthTypeOIDC(ctx, syncCtx, statusHandler, operatorConfig, authnConfig)`
	`110`	`+ statusHandler.AddConditions(status.HandleProgressingOrDegraded("OIDCClientConfig", "MissingID", err))`
`110`	`111`	`if err != nil {`
`111`	`112`	`return statusHandler.FlushAndReturn(err)`
`112`	`113`	`}`
	`114`	`+ } else {`
	`115`	`+ statusHandler.AddConditions(status.HandleProgressingOrDegraded("OIDCClientConfig", "", nil))`
`113`	`116`	`}`
`114`	`117`
`115`	`118`	`oidcClientsSchema, err := authnConfigHasOIDCFields(c.crdLister)`
`@@ -144,9 +147,7 @@ func (c *oidcSetupController) syncAuthTypeOIDC(`
`144`	`147`	`}`
`145`	`148`
`146`	`149`	`if len(clientConfig.ClientID) == 0 {`
`147`		`- err := fmt.Errorf("no ID set on OIDC client")`
`148`		`- statusHandler.AddConditions(status.HandleProgressingOrDegraded("OIDCClientConfig", "MissingID", err))`
`149`		`- return statusHandler.FlushAndReturn(err)`
	`150`	`+ return fmt.Errorf("no ID set on console's OIDC client")`
`150`	`151`	`}`
`151`	`152`	`c.authStatusHandler.WithCurrentOIDCClient(clientConfig.ClientID)`
`152`	`153`