Skip to content

OCPBUGS-61767: Duplicate CRs are shown as Operand instances in operator uninstallation modal #15557

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −0
Open

OCPBUGS-61767: Duplicate CRs are shown as Operand instances in operator uninstallation modal #15557

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
15 changes: 15 additions & 0 deletions pkg/olm/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/openshift/console/pkg/auth"
"github.com/openshift/console/pkg/serverutils"
"github.com/operator-framework/kubectl-operator/pkg/action"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/client-go/rest"
"k8s.io/klog/v2"

Expand Down Expand Up @@ -70,6 +71,20 @@ func (o *OLMHandler) OperandsList(user *auth.User, w http.ResponseWriter, r *htt
serverutils.SendResponse(w, http.StatusBadGateway, serverutils.ApiError{Err: errMsg})
return
}
// Deduplicate operands by UID to prevent duplicate CRs
if operandsList != nil && len(operandsList.Items) > 0 {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add head comment to explain how this work would help.

For example:
// Deduplicate operands by UID to prevent duplicate CRs

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sounds good, thanks so much @Leo6Leo 🚀

seen := make(map[string]bool)
uniqueOperands := make([]unstructured.Unstructured, 0, len(operandsList.Items))

for _, operand := range operandsList.Items {
uid := string(operand.GetUID())
if !seen[uid] {
seen[uid] = true
uniqueOperands = append(uniqueOperands, operand)
}
}
operandsList.Items = uniqueOperands
}

w.Header().Set("Content-Type", "application/json")
resp, err := json.Marshal(operandsList)
Expand Down