Skip to content
This repository has been archived by the owner on Mar 11, 2021. It is now read-only.

chore: try to remove self-healing mechanism from the create action #786

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

chore: try to remove self-healing mechanism from the create action #786

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 38 additions & 37 deletions openshift/action.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,43 +147,44 @@ func (c *commonNamespaceAction) ManageAndUpdateResults(errorChan chan error, env
}

func (c *CreateAction) HealingStrategy() HealingFuncGenerator {
return func(openShiftService *ServiceBuilder) Healing {
return func(originalError error) error {
log.Error(openShiftService.service.context.requestCtx, map[string]interface{}{
"err": originalError,
"self-healing-strategy": "recreate-with-new-nsBaseName",
}, "the creation failed, starting self-healing logic")
openShiftUsername := openShiftService.service.context.openShiftUsername
tnnt, err := c.tenantRepo.GetTenant()
errMsgSuffix := fmt.Sprintf("while doing self-healing operations triggered by error: [%s]", originalError)
if err != nil {
return errors.Wrapf(err, "unable to get tenant %s", errMsgSuffix)
}
namespaces, err := c.tenantRepo.GetNamespaces()
if err != nil {
return errors.Wrapf(err, "unable to get namespaces of tenant %s %s", tnnt.ID, errMsgSuffix)
}
err = openShiftService.Delete(environment.DefaultEnvTypes, namespaces, DeleteOpts().EnableSelfHealing().RemoveFromCluster().ButKeepTenantEntity())
if err != nil {
return errors.Wrapf(err, "deletion of namespaces failed %s", errMsgSuffix)
}
newNsBaseName, err := tenant.ConstructNsBaseName(c.tenantRepo, environment.RetrieveUserName(openShiftUsername))
if err != nil {
return errors.Wrapf(err, "unable to construct namespace base name for user with OSname %s %s", openShiftUsername, errMsgSuffix)
}
tnnt.NsBaseName = newNsBaseName
err = c.tenantRepo.SaveTenant(tnnt)
if err != nil {
return errors.Wrapf(err, "unable to update tenant db entity %s", errMsgSuffix)
}
openShiftService.service.context.nsBaseName = newNsBaseName
err = openShiftService.Create(environment.DefaultEnvTypes, CreateOpts().DisableSelfHealing())
if err != nil {
return errors.Wrapf(err, "unable to create new namespaces %s", errMsgSuffix)
}
return nil
}
}
return NoHealing
//return func(openShiftService *ServiceBuilder) Healing {
// return func(originalError error) error {
// log.Error(openShiftService.service.context.requestCtx, map[string]interface{}{
// "err": originalError,
// "self-healing-strategy": "recreate-with-new-nsBaseName",
// }, "the creation failed, starting self-healing logic")
// openShiftUsername := openShiftService.service.context.openShiftUsername
// tnnt, err := c.tenantRepo.GetTenant()
// errMsgSuffix := fmt.Sprintf("while doing self-healing operations triggered by error: [%s]", originalError)
// if err != nil {
// return errors.Wrapf(err, "unable to get tenant %s", errMsgSuffix)
// }
// namespaces, err := c.tenantRepo.GetNamespaces()
// if err != nil {
// return errors.Wrapf(err, "unable to get namespaces of tenant %s %s", tnnt.ID, errMsgSuffix)
// }
// err = openShiftService.Delete(environment.DefaultEnvTypes, namespaces, DeleteOpts().EnableSelfHealing().RemoveFromCluster().ButKeepTenantEntity())
// if err != nil {
// return errors.Wrapf(err, "deletion of namespaces failed %s", errMsgSuffix)
// }
// newNsBaseName, err := tenant.ConstructNsBaseName(c.tenantRepo, environment.RetrieveUserName(openShiftUsername))
// if err != nil {
// return errors.Wrapf(err, "unable to construct namespace base name for user with OSname %s %s", openShiftUsername, errMsgSuffix)
// }
// tnnt.NsBaseName = newNsBaseName
// err = c.tenantRepo.SaveTenant(tnnt)
// if err != nil {
// return errors.Wrapf(err, "unable to update tenant db entity %s", errMsgSuffix)
// }
// openShiftService.service.context.nsBaseName = newNsBaseName
// err = openShiftService.Create(environment.DefaultEnvTypes, CreateOpts().DisableSelfHealing())
// if err != nil {
// return errors.Wrapf(err, "unable to create new namespaces %s", errMsgSuffix)
// }
// return nil
// }
//}
}

func NewCreateAction(tenantRepo tenant.Repository, actionOpts *ActionOptions) *CreateAction {
Expand Down