Skip to content

Commit b777e0d

Browse files
pooknullhors
andauthored
K8SPXC-1164: delete-proxysql-pvc deletes secrets after switching proxies (#1380)
* K8SPXC-1164: delete-proxysql-pvc deletes secrets after switching proxies https://jira.percona.com/browse/K8SPXC-1164 * small fix --------- Co-authored-by: Viacheslav Sarzhan <[email protected]>
1 parent 6bb7ed8 commit b777e0d

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

pkg/controller/pxc/controller.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,10 @@ func (r *ReconcilePerconaXtraDBCluster) Reconcile(ctx context.Context, request r
239239
sfs = statefulset.NewProxy(o)
240240
// deletePVC is always true on this stage
241241
// because we never reach this point without finalizers
242-
err = r.deleteStatefulSet(o, sfs, true)
242+
err = r.deleteStatefulSet(o, sfs, true, false)
243243
case "delete-pxc-pvc":
244244
sfs = statefulset.NewNode(o)
245-
err = r.deleteStatefulSet(o, sfs, true)
245+
err = r.deleteStatefulSet(o, sfs, true, true)
246246
// nil error gonna be returned only when there is no more pods to delete (only 0 left)
247247
// until than finalizer won't be deleted
248248
case "delete-pxc-pods-in-order":
@@ -412,7 +412,7 @@ func (r *ReconcilePerconaXtraDBCluster) Reconcile(ctx context.Context, request r
412412
}
413413
}
414414

415-
err = r.deleteStatefulSet(o, proxysqlSet, deletePVC)
415+
err = r.deleteStatefulSet(o, proxysqlSet, deletePVC, false)
416416
if err != nil {
417417
return reconcile.Result{}, err
418418
}
@@ -462,7 +462,7 @@ func (r *ReconcilePerconaXtraDBCluster) reconcileHAProxy(cr *api.PerconaXtraDBCl
462462
return errors.Wrap(err, "delete HAProxy service")
463463
}
464464

465-
if err := r.deleteStatefulSet(cr, statefulset.NewHAProxy(cr), false); err != nil {
465+
if err := r.deleteStatefulSet(cr, statefulset.NewHAProxy(cr), false, false); err != nil {
466466
return errors.Wrap(err, "delete HAProxy stateful set")
467467
}
468468

@@ -997,7 +997,7 @@ func (r *ReconcilePerconaXtraDBCluster) deleteStatefulSetPods(namespace string,
997997
return errors.New("waiting for pods to be deleted")
998998
}
999999

1000-
func (r *ReconcilePerconaXtraDBCluster) deleteStatefulSet(cr *api.PerconaXtraDBCluster, sfs api.StatefulApp, deletePVC bool) error {
1000+
func (r *ReconcilePerconaXtraDBCluster) deleteStatefulSet(cr *api.PerconaXtraDBCluster, sfs api.StatefulApp, deletePVC, deleteSecrets bool) error {
10011001
sfsWithOwner := appsv1.StatefulSet{}
10021002
err := r.client.Get(context.TODO(), types.NamespacedName{
10031003
Name: sfs.StatefulSet().Name,
@@ -1024,7 +1024,9 @@ func (r *ReconcilePerconaXtraDBCluster) deleteStatefulSet(cr *api.PerconaXtraDBC
10241024
if err != nil {
10251025
return errors.Wrapf(err, "delete pvc: %s", sfs.StatefulSet().Name)
10261026
}
1027+
}
10271028

1029+
if deleteSecrets {
10281030
err = r.deleteSecrets(cr)
10291031
if err != nil {
10301032
return errors.Wrap(err, "delete secrets")

0 commit comments

Comments
 (0)