seg_yinzy
/
che-operator
mirror of https://github.com/eclipse-che/che-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'createInitialOpenshift4UserForOAuth' of github.com:AndrienkoAleksandr/che-operator into createInitialOpenshift4UserForOAuth

pull/597/head
Oleksandr Andriienko 2021-02-11 12:50:25 +02:00
parent bd3fba2030 8240cae80a
commit 9986117efb
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/controller/che/che_controller.go
View File

@ -386,13 +386,9 @@ func (r *ReconcileChe) Reconcile(request reconcile.Request) (reconcile.Result, e
if isOpenShift4 && util.IsDeleteOAuthInitialUser(instance) {
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 {