@@ -239,10 +239,10 @@ func (r *ReconcilePerconaXtraDBCluster) Reconcile(ctx context.Context, request r
239
239
sfs = statefulset .NewProxy (o )
240
240
// deletePVC is always true on this stage
241
241
// because we never reach this point without finalizers
242
- err = r .deleteStatefulSet (o , sfs , true )
242
+ err = r .deleteStatefulSet (o , sfs , true , false )
243
243
case "delete-pxc-pvc" :
244
244
sfs = statefulset .NewNode (o )
245
- err = r .deleteStatefulSet (o , sfs , true )
245
+ err = r .deleteStatefulSet (o , sfs , true , true )
246
246
// nil error gonna be returned only when there is no more pods to delete (only 0 left)
247
247
// until than finalizer won't be deleted
248
248
case "delete-pxc-pods-in-order" :
@@ -412,7 +412,7 @@ func (r *ReconcilePerconaXtraDBCluster) Reconcile(ctx context.Context, request r
412
412
}
413
413
}
414
414
415
- err = r .deleteStatefulSet (o , proxysqlSet , deletePVC )
415
+ err = r .deleteStatefulSet (o , proxysqlSet , deletePVC , false )
416
416
if err != nil {
417
417
return reconcile.Result {}, err
418
418
}
@@ -462,7 +462,7 @@ func (r *ReconcilePerconaXtraDBCluster) reconcileHAProxy(cr *api.PerconaXtraDBCl
462
462
return errors .Wrap (err , "delete HAProxy service" )
463
463
}
464
464
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 {
466
466
return errors .Wrap (err , "delete HAProxy stateful set" )
467
467
}
468
468
@@ -997,7 +997,7 @@ func (r *ReconcilePerconaXtraDBCluster) deleteStatefulSetPods(namespace string,
997
997
return errors .New ("waiting for pods to be deleted" )
998
998
}
999
999
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 {
1001
1001
sfsWithOwner := appsv1.StatefulSet {}
1002
1002
err := r .client .Get (context .TODO (), types.NamespacedName {
1003
1003
Name : sfs .StatefulSet ().Name ,
@@ -1024,7 +1024,9 @@ func (r *ReconcilePerconaXtraDBCluster) deleteStatefulSet(cr *api.PerconaXtraDBC
1024
1024
if err != nil {
1025
1025
return errors .Wrapf (err , "delete pvc: %s" , sfs .StatefulSet ().Name )
1026
1026
}
1027
+ }
1027
1028
1029
+ if deleteSecrets {
1028
1030
err = r .deleteSecrets (cr )
1029
1031
if err != nil {
1030
1032
return errors .Wrap (err , "delete secrets" )
0 commit comments