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

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
service.operatorName value from managedBy to requested name 
Signed-off-by: Ben Luzarraga <[email protected]>
  • Loading branch information
@bluzarraga
bluzarraga committed Apr 18, 2023
commit e23258384c970385a53a326e5ae27be7fee6e181
48 changes: 4 additions & 44 deletions controllers/operandrequest/reconcile_operand.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ func (r *Reconciler) reconcileOperand(ctx context.Context, requestInstance *oper
klog.V(2).Infof("There is no service: %s from the OperandConfig instance: %s/%s, Skip reconciling Operands", operand.Name, registryKey.Namespace, req.Registry)
continue
}
err = r.reconcileCRwithConfig(ctx, opdConfig, configInstance.Namespace, csv, requestInstance, sub.Namespace, &r.Mutex)
err = r.reconcileCRwithConfig(ctx, opdConfig, configInstance.Namespace, csv, requestInstance, operand.Name, sub.Namespace, &r.Mutex)
if err != nil {
merr.Add(err)
requestInstance.SetMemberStatus(operand.Name, "", operatorv1alpha1.ServiceFailed, &r.Mutex)
Expand Down Expand Up @@ -215,7 +215,7 @@ func (r *Reconciler) reconcileOperand(ctx context.Context, requestInstance *oper
}

// reconcileCRwithConfig merge and create custom resource base on OperandConfig and CSV alm-examples
func (r *Reconciler) reconcileCRwithConfig(ctx context.Context, service *operatorv1alpha1.ConfigService, namespace string, csv *olmv1alpha1.ClusterServiceVersion, requestInstance *operatorv1alpha1.OperandRequest, operatorNamespace string, mu sync.Locker) error {
func (r *Reconciler) reconcileCRwithConfig(ctx context.Context, service *operatorv1alpha1.ConfigService, namespace string, csv *olmv1alpha1.ClusterServiceVersion, requestInstance *operatorv1alpha1.OperandRequest, operandName string, operatorNamespace string, mu sync.Locker) error {
merr := &util.MultiErr{}

// Create k8s resources required by service
Expand Down Expand Up @@ -337,10 +337,6 @@ func (r *Reconciler) reconcileCRwithConfig(ctx context.Context, service *operato
merr.Add(err)
continue
}
managedBy, err := r.getManagedBy(crFromALM)
if err != nil {
return err
}
statusSpec, err := r.getOperandStatus(crFromALM)
if err != nil {
return err
Expand All @@ -349,7 +345,7 @@ func (r *Reconciler) reconcileCRwithConfig(ctx context.Context, service *operato
if serviceKind != "OperandRequest" && statusSpec.ObjectName != "" {
var resources []operatorv1alpha1.OperandStatus
resources = append(resources, statusSpec)
serviceSpec := newServiceStatus(managedBy, operatorNamespace, resources)
serviceSpec := newServiceStatus(operandName, operatorNamespace, resources)
seterr := requestInstance.SetServiceStatus(ctx, serviceSpec, r.Client, mu)
if seterr != nil {
return seterr
Expand Down Expand Up @@ -421,18 +417,14 @@ func (r *Reconciler) reconcileCRwithRequest(ctx context.Context, requestInstance
if err := r.updateCustomResource(ctx, crFromRequest, requestKey.Namespace, operand.Kind, operand.Spec.Raw, map[string]interface{}{}); err != nil {
return err
}
managedBy, err := r.getManagedBy(crFromRequest)
if err != nil {
return err
}
statusSpec, err := r.getOperandStatus(crFromRequest)
if err != nil {
return err
}
if operand.Kind != "OperandRequest" && statusSpec.ObjectName != "" {
var resources []operatorv1alpha1.OperandStatus
resources = append(resources, statusSpec)
serviceSpec := newServiceStatus(managedBy, operatorNamespace, resources)
serviceSpec := newServiceStatus(operand.Name, operatorNamespace, resources)
seterr := requestInstance.SetServiceStatus(ctx, serviceSpec, r.Client, mu)
if seterr != nil {
return seterr
Expand All @@ -449,38 +441,6 @@ func (r *Reconciler) reconcileCRwithRequest(ctx context.Context, requestInstance
return nil
}

func (r *Reconciler) getManagedBy(existingCR unstructured.Unstructured) (string, error) {
byteMetadata, err := json.Marshal(existingCR.Object["metadata"])
if err != nil {
klog.Error(err)
return "", err
}
var rawMetadata map[string]interface{}
err = json.Unmarshal(byteMetadata, &rawMetadata)
if err != nil {
klog.Error(err)
return "", err
}
byteLabels, err := json.Marshal(rawMetadata["labels"])
if err != nil {
klog.Error(err)
return "", err
}
var parsedLabels map[string]string
err = json.Unmarshal(byteLabels, &parsedLabels)
if err != nil {
klog.Error(err)
return "", err
}
var managedBy string
for key, value := range parsedLabels {
if key == "app.kubernetes.io/managed-by" {
managedBy = value
}
}
return managedBy, nil
}

func (r *Reconciler) getOperandStatus(existingCR unstructured.Unstructured) (operatorv1alpha1.OperandStatus, error) {
var emptyStatus operatorv1alpha1.OperandStatus
byteStatus, err := json.Marshal(existingCR.Object["status"])
Expand Down