Skip to content

check for status.services, im service status #916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ibm-ci-bot merged 9 commits into from
Apr 19, 2023
Merged

check for status.services, im service status #916

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5e2dd23
check for status.services, im service status
bluzarraga Apr 12, 2023
957f9b1
alter check for im operator status
bluzarraga Apr 12, 2023
264e2e8
export function
bluzarraga Apr 12, 2023
455ff67
account for opreq that do not request im
bluzarraga Apr 12, 2023
2524c51
typo
bluzarraga Apr 12, 2023
5586946
clean up implementation
bluzarraga Apr 12, 2023
607af5f
linter changes
bluzarraga Apr 12, 2023
e232583
service.operatorName value from managedBy to requested name
bluzarraga Apr 18, 2023
bac9a97
change common ui operator name to look for
bluzarraga Apr 18, 2023
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
Prev Previous commit
Next Next commit
alter check for im operator status 
Signed-off-by: Ben Luzarraga <[email protected]>
  • Loading branch information
@bluzarraga
bluzarraga committed Apr 12, 2023
commit 957f9b1637655507cb5756f614cbf333e5ff1f52
4 changes: 4 additions & 0 deletions api/v1alpha1/operandrequest_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,10 @@ func foundOperand(requests []Request, name string) bool {
return false
}

func (r *OperandRequest) operandRequested(name string) bool {
return foundOperand(r.Spec.Requests, name)
}

func getMemberStatus(status *OperandRequestStatus, name string) (int, *MemberStatus) {
for i, m := range status.Members {
if name == m.Name {
Expand Down
31 changes: 17 additions & 14 deletions controllers/operandrequest/operandrequest_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,24 +158,27 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
klog.Info("Waiting for status.services to be instantiated ...")
return ctrl.Result{RequeueAfter: constant.DefaultRequeueDuration}, nil
} else {
var imIndex int
found := false
for i, s := range requestInstance.Status.Services {
if "ibm-im-operator" == s.OperatorName {
found = true
imIndex = i
break
if requestInstance.operandRequested("ibm-im-operator") {
var imIndex int
found := false
for i, s := range requestInstance.Status.Services {
if "ibm-im-operator" == s.OperatorName {
found = true
imIndex = i
break
}
}
}
if found == true {
if requestInstance.Status.Services[imIndex].Status != "Ready" {
klog.Info("Waiting for IM service to be Ready ...")
if found == true {
if requestInstance.Status.Services[imIndex].Status != "Ready" {
klog.Info("Waiting for IM service to be Ready ...")
return ctrl.Result{RequeueAfter: constant.DefaultRequeueDuration}, nil
}
} else {
klog.Info("Waiting for IM service status ...")
return ctrl.Result{RequeueAfter: constant.DefaultRequeueDuration}, nil
}
} else {
klog.Info("Waiting for IM service status ...")
return ctrl.Result{RequeueAfter: constant.DefaultRequeueDuration}, nil
}

}

klog.V(1).Infof("Finished reconciling OperandRequest: %s", req.NamespacedName)
Expand Down