Skip to content

K8SPSMDB-1070: Fix panic in delete-psmdb-pods-in-order finalizer #1525

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
merged 5 commits into from
Apr 22, 2024
Merged

K8SPSMDB-1070: Fix panic in delete-psmdb-pods-in-order finalizer #1525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1e15cf0
K8SPSMDB-1070: Fix panic in delete-psmdb-pods-in-order finalizer
egegunes Apr 18, 2024
b04ba70
Merge branch 'main' into K8SPSMDB-1070
egegunes Apr 19, 2024
1a0093d
Merge branch 'main' into K8SPSMDB-1070
hors Apr 19, 2024
ebe382a
fix cw-bundle.yaml
hors Apr 19, 2024
f17ef3e
fix pause
egegunes Apr 20, 2024
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
2 changes: 1 addition & 1 deletion deploy/cw-bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18300,7 +18300,7 @@ spec:
serviceAccountName: percona-server-mongodb-operator
containers:
- name: percona-server-mongodb-operator
image: perconalab/percona-server-mongodb-operator:k8spsmdb-755
image: perconalab/percona-server-mongodb-operator:main
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down
16 changes: 7 additions & 9 deletions pkg/controller/perconaservermongodb/finalizers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,14 @@ func (r *ReconcilePerconaServerMongoDB) deletePSMDBPods(ctx context.Context, cr
replsetsDeleted := true
for _, rs := range cr.Spec.Replsets {
if err := r.deleteRSPods(ctx, cr, rs); err != nil {
if err != nil {
switch err {
case errWaitingTermination, errWaitingFirstPrimary:
log.Info(err.Error(), "rs", rs.Name)
default:
log.Error(err, "failed to delete rs pods", "rs", rs.Name)
}
replsetsDeleted = false
continue
switch err {
case errWaitingTermination, errWaitingFirstPrimary:
log.Info(err.Error(), "rs", rs.Name)
default:
log.Error(err, "failed to delete rs pods", "rs", rs.Name)
}
replsetsDeleted = false
continue
}
}
if !replsetsDeleted {
Expand Down
1 change: 0 additions & 1 deletion pkg/controller/perconaservermongodb/statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
)

// TODO: reduce cyclomatic complexity
func (r *ReconcilePerconaServerMongoDB) reconcileStatefulSet(ctx context.Context, cr *api.PerconaServerMongoDB, rs *api.ReplsetSpec, ls map[string]string) (*appsv1.StatefulSet, error) {
log := logf.FromContext(ctx)

Expand Down