update: review comments

Signed-off-by: Wen Zhou <[email protected]>
opendatahub-io · Oct 14, 2024 · 2d7737b · 2d7737b
1 parent 277cc87
commit 2d7737b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/controllers/dscinitialization/dscinitialization_controller.go b/controllers/dscinitialization/dscinitialization_controller.go
@@ -215,10 +215,8 @@ func (r *DSCInitializationReconciler) Reconcile(ctx context.Context, req ctrl.Re
 		return ctrl.Result{}, nil
 	default:
 		createUsergroup, err := cluster.IsDefaultAuthMethod(ctx, r.Client)
-		if err != nil {
-			if !k8serr.IsNotFound(err) { // only keep reconcile if real error but not missing CRD or missing CR
-				return ctrl.Result{}, err
-			}
+		if err != nil && !k8serr.IsNotFound(err) { // only keep reconcile if real error but not missing CRD or missing CR
+			return ctrl.Result{}, err
 		}
 
 		switch platform {

diff --git a/pkg/cluster/cluster_config.go b/pkg/cluster/cluster_config.go
@@ -241,5 +241,5 @@ func IsDefaultAuthMethod(ctx context.Context, cli client.Client) (bool, error) {
 	// for now, HPC support "" "None" "IntegratedOAuth"(default) "OIDC"
 	// other offering support "" "None" "IntegratedOAuth"(default)
 	// we only create userGroups for "IntegratedOAuth" or "" and leave other or new supported type value in the future
-	return (authenticationobj.Spec.Type == configv1.AuthenticationTypeIntegratedOAuth || authenticationobj.Spec.Type == ""), nil
+	return authenticationobj.Spec.Type == configv1.AuthenticationTypeIntegratedOAuth || authenticationobj.Spec.Type == "", nil
 }