Skip to content

create ibm-cpp-config in non-olm #2357

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 3 commits into from
Jan 31, 2025
Merged

create ibm-cpp-config in non-olm #2357

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c273f9
add ibm-cpp-config backin in non-olm env
qpdpQ Jan 30, 2025
e6b14fa
remove comment
qpdpQ Jan 30, 2025
cd6f913
create ibm-cpp-config
qpdpQ Jan 31, 2025
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
create ibm-cpp-config 
Signed-off-by: Allen Li <[email protected]>
  • Loading branch information
@qpdpQ
qpdpQ committed Jan 31, 2025
commit cd6f913612019a86e06635fa01394bb4f5cd3af3
7 changes: 7 additions & 0 deletions controllers/commonservice_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ func (r *CommonServiceReconciler) Reconcile(ctx context.Context, req ctrl.Reques
if os.Getenv("NO_OLM") == "true" {
klog.Infof("Reconciling CommonService: %s in non OLM environment", req.NamespacedName)

// create ibm-cpp-config configmap
if err := configurationcollector.CreateUpdateConfig(r.Bootstrap); err != nil {
klog.Errorf("Fail to reconcile %s/%s: %v", instance.Namespace, instance.Name, err)
return ctrl.Result{}, err
Expand All @@ -121,6 +122,12 @@ func (r *CommonServiceReconciler) Reconcile(ctx context.Context, req ctrl.Reques
klog.Errorf("Fail to Installing/Updating OperandConfig: %v", err)
return ctrl.Result{}, err
}

// Temporary solution for EDB image ConfigMap reference
if err := r.Bootstrap.CreateEDBImageMaps(); err != nil {
klog.Errorf("Failed to create EDB Image ConfigMap: %v", err)
return ctrl.Result{}, err
}
} else {
klog.Error("ODLM CRD not ready, waiting for it to be ready")
}
Expand Down
Loading