From 8240cae80a95b33cebadf48c10f8e494982af5bd Mon Sep 17 00:00:00 2001 From: Oleksandr Andriienko Date: Thu, 11 Feb 2021 12:07:50 +0200 Subject: [PATCH] Update pkg/controller/che/che_controller.go Co-authored-by: Anatolii Bazko --- pkg/controller/che/che_controller.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkg/controller/che/che_controller.go b/pkg/controller/che/che_controller.go index ea4e78d24..be5bc2cb6 100644 --- a/pkg/controller/che/che_controller.go +++ b/pkg/controller/che/che_controller.go @@ -387,13 +387,9 @@ func (r *ReconcileChe) Reconcile(request reconcile.Request) (reconcile.Result, e if isOpenShift4 && instance.Spec.Auth.InitialOpenShiftOAuthUser != nil && !*instance.Spec.Auth.InitialOpenShiftOAuthUser && instance.Status.OpenShiftOAuthUserCredentialsSecret != "" { if err := r.userHandler.DeleteOAuthInitialUser(deployContext); err != nil { logrus.Errorf("Unable to delete initial OpenShift OAuth user from a cluster. Cause: %s", err.Error()) - instance.Status.OpenShiftOAuthUserCredentialsSecret = "" - if err := r.UpdateCheCRStatus(instance, "openShiftOAuthUserCredentialsSecret", openShiftOAuthUserCredentialsSecret); err != nil { - return reconcile.Result{}, err - } - if err := r.UpdateCheCRSpec(instance, "InitialOpenShiftOAuthUser", "nil"); err != nil { - return reconcile.Result{}, err - } + instance.Spec.Auth.InitialOpenShiftOAuthUser = nil + err := r.UpdateCheCRSpec(instance, "InitialOpenShiftOAuthUser", "nil") + return reconcile.Result{RequeueAfter: time.Second * 1}, err } instance.Status.OpenShiftOAuthUserCredentialsSecret = "" if err := r.UpdateCheCRStatus(instance, "openShiftOAuthUserCredentialsSecret", openShiftOAuthUserCredentialsSecret); err != nil {