From 753eafe88c77e9fde97059d3ced62fe39e7ca47d Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Tue, 14 Sep 2021 16:54:35 +0300 Subject: [PATCH] fix: don't add intial OpenShift OAuth user if native user mode is on (#1066) Signed-off-by: Anatolii Bazko --- controllers/che/checluster_controller.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/controllers/che/checluster_controller.go b/controllers/che/checluster_controller.go index 3ff76ca2d..57c46b79e 100644 --- a/controllers/che/checluster_controller.go +++ b/controllers/che/checluster_controller.go @@ -685,6 +685,10 @@ func (r *CheClusterReconciler) autoEnableOAuth(deployContext *deploy.DeployConte } else { if len(openshitOAuth.Spec.IdentityProviders) > 0 { oauth = true + } else if util.IsNativeUserModeEnabled(deployContext.CheCluster) { + // enable OpenShift OAuth without adding initial OpenShift OAuth user + // since kubeadmin is a valid user for native user mode + oauth = true } else if util.IsInitialOpenShiftOAuthUserEnabled(cr) { provisioned, err := r.userHandler.SyncOAuthInitialUser(openshitOAuth, deployContext) if err != nil {