Merge branch 'main' into K8SPSMDB-1013-mongo-7-0

percona · Mar 25, 2024 · 2bf739e · 2bf739e
2 parents 11b0bb2 + c697fa7
commit 2bf739e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/e2e-tests/monitoring-2-0/run b/e2e-tests/monitoring-2-0/run
@@ -126,6 +126,12 @@ wait_for_delete "pod/${cluster}-mongos-0"
 wait_for_delete "pod/${cluster}-rs0-0"
 wait_for_delete "pod/${cluster}-cfg-0"
 
+desc 'check if services are not deleted'
+
+kubectl_bin get svc $cluster-rs0
+kubectl_bin get svc $cluster-cfg
+kubectl_bin get svc $cluster-mongos
+
 does_node_id_exists_in_pmm=($(does_node_id_exists "${nodeList[@]}"))
 for instance in "${does_node_id_exists_in_pmm[@]}"; do
 	if [ -n "$instance" ]; then

diff --git a/pkg/controller/perconaservermongodb/psmdb_controller.go b/pkg/controller/perconaservermongodb/psmdb_controller.go
@@ -1289,6 +1289,10 @@ func (r *ReconcilePerconaServerMongoDB) reconcileMongos(ctx context.Context, cr
 }
 
 func (r *ReconcilePerconaServerMongoDB) removeOutdatedMongosSvc(ctx context.Context, cr *api.PerconaServerMongoDB) error {
+	if cr.Spec.Pause && cr.Spec.Sharding.Enabled {
+		return nil
+	}
+
 	svcNames := make(map[string]struct{}, cr.Spec.Sharding.Mongos.Size)
 	if cr.Spec.Sharding.Mongos.Expose.ServicePerPod {
 		for i := 0; i < int(cr.Spec.Sharding.Mongos.Size); i++ {