Skip to content

Removed EDB image list created by cs operator for non-olm case #2376

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 1 commit into from
Feb 11, 2025
Merged

Removed EDB image list created by cs operator for non-olm case #2376

Show file tree
Hide file tree
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
10 changes: 7 additions & 3 deletions controllers/bootstrap/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"bytes"
"context"
"fmt"
"os"
"reflect"
"strconv"
"strings"
Expand Down Expand Up @@ -223,9 +224,12 @@ func (b *Bootstrap) InitResources(instance *apiv3.CommonService, forceUpdateODLM
}

// Temporary solution for EDB image ConfigMap reference
if err := b.CreateEDBImageMaps(); err != nil {
klog.Errorf("Failed to create EDB Image ConfigMap: %v", err)
return err
if os.Getenv("NO_OLM") != "true" {
klog.Infof("It is not a non-OLM mode, create EDB Image ConfigMap")
if err := b.CreateEDBImageMaps(); err != nil {
klog.Errorf("Failed to create EDB Image ConfigMap: %v", err)
return err
}
}

// Create Keycloak themes ConfigMap
Expand Down
9 changes: 5 additions & 4 deletions controllers/commonservice_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,11 @@ func (r *CommonServiceReconciler) Reconcile(ctx context.Context, req ctrl.Reques
}

// 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
}
klog.Infof("It is a non-OLM mode, skip creating EDB Image ConfigMap...")
// 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