Skip to content

Commit 7a64257

Browse files
authored
K8SPG-637: add internal. prefix to operator finalizers (percona#1035)
1 parent fdd16c1 commit 7a64257

File tree

5 files changed

+24
-13
lines changed

5 files changed

+24
-13
lines changed

e2e-tests/tests/finalizers/01-assert.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ metadata:
124124
finalizers:
125125
- percona.com/delete-pvc
126126
- percona.com/delete-ssl
127-
- percona.com/stop-watchers
127+
- internal.percona.com/stop-watchers
128128
status:
129129
pgbouncer:
130130
ready: 3

e2e-tests/tests/finalizers/03-assert.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ metadata:
124124
finalizers:
125125
- percona.com/delete-pvc
126126
- percona.com/delete-ssl
127-
- percona.com/stop-watchers
127+
- internal.percona.com/stop-watchers
128128
status:
129129
pgbouncer:
130130
ready: 3

percona/controller/pgcluster/controller.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"fmt"
88
"io"
99
"reflect"
10+
"slices"
1011
"strings"
1112
"time"
1213

@@ -861,15 +862,18 @@ func (r *PGClusterReconciler) stopExternalWatcher(ctx context.Context, cr *v2.Pe
861862
}
862863

863864
func (r *PGClusterReconciler) ensureFinalizers(ctx context.Context, cr *v2.PerconaPGCluster) error {
864-
for _, finalizer := range cr.Finalizers {
865-
if finalizer == pNaming.FinalizerStopWatchers {
866-
return nil
867-
}
865+
if !slices.Contains(cr.Finalizers, pNaming.FinalizerStopWatchersDeprecated) && slices.Contains(cr.Finalizers, pNaming.FinalizerStopWatchers) {
866+
return nil
868867
}
869868

870869
if *cr.Spec.Backups.TrackLatestRestorableTime {
871870
orig := cr.DeepCopy()
872-
cr.Finalizers = append(cr.Finalizers, pNaming.FinalizerStopWatchers)
871+
cr.Finalizers = slices.DeleteFunc(cr.Finalizers, func(f string) bool {
872+
return f == pNaming.FinalizerStopWatchersDeprecated
873+
})
874+
if !slices.Contains(cr.Finalizers, pNaming.FinalizerStopWatchers) {
875+
cr.Finalizers = append(cr.Finalizers, pNaming.FinalizerStopWatchers)
876+
}
873877
if err := r.Client.Patch(ctx, cr.DeepCopy(), client.MergeFrom(orig)); err != nil {
874878
return errors.Wrap(err, "patch finalizers")
875879
}

percona/naming/finalizers.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,18 @@ package naming
44
const (
55
FinalizerDeletePVC = PrefixPercona + "delete-pvc"
66
FinalizerDeleteSSL = PrefixPercona + "delete-ssl"
7-
FinalizerStopWatchers = PrefixPercona + "stop-watchers" //nolint:gosec
7+
FinalizerStopWatchers = PrefixPerconaInternal + "stop-watchers" //nolint:gosec
88
FinalizerDeleteBackups = PrefixPercona + "delete-backups"
9+
10+
FinalizerStopWatchersDeprecated = PrefixPercona + "stop-watchers" //nolint:gosec
911
)
1012

1113
// PerconaPGRestore finalizers
1214
const (
13-
FinalizerDeleteRestore = PrefixPercona + "delete-restore" //nolint:gosec
14-
FinalizerDeleteBackup = PrefixPercona + "delete-backup" //nolint:gosec
15+
FinalizerDeleteRestore = PrefixPerconaInternal + "delete-restore" //nolint:gosec
16+
)
17+
18+
// PerconaPGBackup finalizers
19+
const (
20+
FinalizerDeleteBackup = PrefixPerconaInternal + "delete-backup" //nolint:gosec
1521
)

percona/naming/prefix.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ package naming
33
import "strings"
44

55
const (
6-
PrefixPercona = "percona.com/"
7-
PrefixPerconaPGV2 = "pgv2.percona.com/"
8-
PrefixCrunchy = "postgres-operator.crunchydata.com/"
6+
PrefixPercona = "percona.com/"
7+
PrefixPerconaInternal = "internal." + PrefixPercona
8+
PrefixPerconaPGV2 = "pgv2.percona.com/"
9+
PrefixCrunchy = "postgres-operator.crunchydata.com/"
910
)
1011

1112
func ToCrunchyAnnotation(annotation string) string {

0 commit comments

Comments
 (0)