K8SPSMDB-968: fix .status.host for exposed replset (#1312)

* K8SPSMDB-968: fix `.status.host` for exposed replset

https://jira.percona.com/browse/K8SPSMDB-968

* Update pkg/controller/perconaservermongodb/version_test.go

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* sort hosts and show cluster-ip hosts

* set FQDNs to `.status.host` if exposed as `ClusterIP`

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Viacheslav Sarzhan <[email protected]>

Author: 3 people

pkg/controller/perconaservermongodb/connections_test.go

@@ -11,7 +11,6 @@ import (
 	"golang.org/x/sync/errgroup"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -34,21 +33,6 @@ func TestConnectionLeaks(t *testing.T) {
 	logf.SetLogger(zap.New(zap.WriteTo(io.Discard)))
 	ctx := context.Background()
 
-	q, err := resource.ParseQuantity("1Gi")
-	if err != nil {
-		t.Fatal(err)
-	}
-	volumeSpec := &api.VolumeSpec{
-		PersistentVolumeClaim: api.PVCSpec{
-			PersistentVolumeClaimSpec: &corev1.PersistentVolumeClaimSpec{
-				Resources: corev1.ResourceRequirements{
-					Requests: map[corev1.ResourceName]resource.Quantity{
-						corev1.ResourceStorage: q,
-					},
-				},
-			},
-		},
-	}
 	cr := &api.PerconaServerMongoDB{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:       "psmdb-mock",
@@ -65,7 +49,7 @@ func TestConnectionLeaks(t *testing.T) {
 				{
 					Name:       "rs0",
 					Size:       3,
-					VolumeSpec: volumeSpec,
+					VolumeSpec: fakeVolumeSpec(t),
 				},
 			},
 			UpdateStrategy: api.SmartUpdateStatefulSetStrategyType,
@@ -103,7 +87,7 @@ func TestConnectionLeaks(t *testing.T) {
 				cr.Spec.Sharding.Enabled = true
 				cr.Spec.Sharding.ConfigsvrReplSet = &api.ReplsetSpec{
 					Size:       3,
-					VolumeSpec: volumeSpec,
+					VolumeSpec: fakeVolumeSpec(t),
 				}
 				cr.Spec.Sharding.Mongos = &api.MongosSpec{
 					Size: 3,
@@ -118,7 +102,7 @@ func TestConnectionLeaks(t *testing.T) {
 				cr.Spec.Sharding.Enabled = true
 				cr.Spec.Sharding.ConfigsvrReplSet = &api.ReplsetSpec{
 					Size:       3,
-					VolumeSpec: volumeSpec,
+					VolumeSpec: fakeVolumeSpec(t),
 				}
 				cr.Spec.Sharding.Mongos = &api.MongosSpec{
 					Size: 3,

pkg/controller/perconaservermongodb/mgo.go

@@ -255,7 +255,7 @@ func (r *ReconcilePerconaServerMongoDB) updateConfigMembers(ctx context.Context,
 			break
 		}
 
-		host, err := psmdb.MongoHost(ctx, r.client, cr, rs.Name, rs.Expose.Enabled, pod)
+		host, err := psmdb.MongoHost(ctx, r.client, cr, cr.Spec.ClusterServiceDNSMode, rs.Name, rs.Expose.Enabled, pod)
 		if err != nil {
 			return 0, fmt.Errorf("get host for pod %s: %v", pod.Name, err)
 		}
@@ -513,7 +513,7 @@ func (r *ReconcilePerconaServerMongoDB) handleRsAddToShard(ctx context.Context,
 		return errors.New("mongos pod is not ready")
 	}
 
-	host, err := psmdb.MongoHost(ctx, r.client, cr, replset.Name, replset.Expose.Enabled, rspod)
+	host, err := psmdb.MongoHost(ctx, r.client, cr, cr.Spec.ClusterServiceDNSMode, replset.Name, replset.Expose.Enabled, rspod)
 	if err != nil {
 		return errors.Wrapf(err, "get rsPod %s host", rspod.Name)
 	}
@@ -564,7 +564,7 @@ func (r *ReconcilePerconaServerMongoDB) handleReplsetInit(ctx context.Context, c
 
 		log.Info("initiating replset", "replset", replsetName, "pod", pod.Name)
 
-		host, err := psmdb.MongoHost(ctx, r.client, cr, replset.Name, replset.Expose.Enabled, pod)
+		host, err := psmdb.MongoHost(ctx, r.client, cr, cr.Spec.ClusterServiceDNSMode, replset.Name, replset.Expose.Enabled, pod)
 		if err != nil {
 			return fmt.Errorf("get host for the pod %s: %v", pod.Name, err)
 		}

pkg/controller/perconaservermongodb/psmdb_controller.go

@@ -1178,7 +1178,7 @@ func (r *ReconcilePerconaServerMongoDB) reconcileMongos(ctx context.Context, cr
 
 	cfgInstances := make([]string, 0, len(cfgPods.Items)+len(cr.Spec.Sharding.ConfigsvrReplSet.ExternalNodes))
 	for _, pod := range cfgPods.Items {
-		host, err := psmdb.MongoHost(ctx, r.client, cr, api.ConfigReplSetName, false, pod)
+		host, err := psmdb.MongoHost(ctx, r.client, cr, cr.Spec.ClusterServiceDNSMode, api.ConfigReplSetName, false, pod)
 		if err != nil {
 			return errors.Wrapf(err, "get host for pod '%s'", pod.Name)
 		}

pkg/controller/perconaservermongodb/smart.go

@@ -184,7 +184,7 @@ func (r *ReconcilePerconaServerMongoDB) smartUpdate(ctx context.Context, cr *api
 func (r *ReconcilePerconaServerMongoDB) isPodPrimary(ctx context.Context, cr *api.PerconaServerMongoDB, pod corev1.Pod, rs *api.ReplsetSpec) (bool, error) {
 	log := logf.FromContext(ctx)
 
-	host, err := psmdb.MongoHost(ctx, r.client, cr, rs.Name, rs.Expose.Enabled, pod)
+	host, err := psmdb.MongoHost(ctx, r.client, cr, cr.Spec.ClusterServiceDNSMode, rs.Name, rs.Expose.Enabled, pod)
 	if err != nil {
 		return false, errors.Wrap(err, "failed to get mongo host")
 	}

pkg/controller/perconaservermongodb/status.go

@@ -3,6 +3,7 @@ package perconaservermongodb
 import (
 	"context"
 	"fmt"
+	"sort"
 	"strings"
 	"time"
 
@@ -369,11 +370,11 @@ func (r *ReconcilePerconaServerMongoDB) connectionEndpoint(ctx context.Context,
 		if err != nil {
 			return "", errors.Wrap(err, "get mongos addresses")
 		}
+		sort.Strings(addrs)
 		return strings.Join(addrs, ","), nil
 	}
 
-	if rs := cr.Spec.Replsets[0]; rs.Expose.Enabled &&
-		rs.Expose.ExposeType == corev1.ServiceTypeLoadBalancer {
+	if rs := cr.Spec.Replsets[0]; rs.Expose.Enabled && (rs.Expose.ExposeType == corev1.ServiceTypeLoadBalancer || rs.Expose.ExposeType == corev1.ServiceTypeClusterIP) {
 		list := corev1.PodList{}
 		err := r.client.List(ctx,
 			&list,
@@ -391,14 +392,19 @@ func (r *ReconcilePerconaServerMongoDB) connectionEndpoint(ctx context.Context,
 		if err != nil {
 			return "", errors.Wrap(err, "list psmdb pods")
 		}
-		addrs, err := psmdb.GetReplsetAddrs(ctx, r.client, cr, rs.Name, rs.Expose.Enabled, list.Items)
+		dnsMode := api.DNSModeInternal
+		if rs.Expose.ExposeType == corev1.ServiceTypeLoadBalancer {
+			dnsMode = api.DNSModeExternal
+		}
+		addrs, err := psmdb.GetReplsetAddrs(ctx, r.client, cr, dnsMode, rs.Name, rs.Expose.Enabled, list.Items)
 		if err != nil {
 			switch errors.Cause(err) {
 			case psmdb.ErrNoIngressPoints, psmdb.ErrServiceNotExists:
 				return "", nil
 			}
 			return "", errors.Wrap(err, "get replset addresses")
 		}
+		sort.Strings(addrs)
 		return strings.Join(addrs, ","), nil
 	}