fix errors from conflicts

Author: gkech

internal/controller/postgrescluster/instance.go

@@ -1488,7 +1488,7 @@ func (r *Reconciler) reconcileCertManagerInstanceCertificates(
 	log := logging.FromContext(ctx)
 	c := r.CertManagerCtrlFunc(r.Client, r.Scheme, false)
 
-	dnsNames := naming.InstancePodDNSNames(ctx, instance)
+	dnsNames := naming.InstancePodDNSNames(ctx, instance, cluster.Spec.ClusterServiceDNSSuffix)
 
 	err := c.ApplyInstanceCertificate(ctx, cluster, instance.Name, dnsNames)
 	if err != nil {
@@ -1554,7 +1554,7 @@ func (r *Reconciler) reconcileCertManagerInstanceCertificates(
 		}
 	} else {
 		var leafCert *pki.LeafCertificate
-		leafCert, err = r.instanceCertificate(ctx, instance, existing, instanceCerts, rootCertificateAuth)
+		leafCert, err = r.instanceCertificate(ctx, instance, existing, instanceCerts, rootCertificateAuth, cluster.Spec.ClusterServiceDNSSuffix)
 		if err != nil {
 			return nil, errors.Wrap(err, "failed to generate instance certificate")
 		}

internal/controller/postgrescluster/pgbouncer.go

@@ -230,7 +230,7 @@ func (r *Reconciler) reconcilePGBouncerSecret(
 		if certManagerInstalled {
 			c := r.CertManagerCtrlFunc(r.Client, r.Scheme, false)
 
-			dnsNames, dnsErr := naming.ServiceDNSNames(ctx, service)
+			dnsNames, dnsErr := naming.ServiceDNSNames(ctx, service, cluster.Spec.ClusterServiceDNSSuffix)
 			if dnsErr != nil {
 				return nil, errors.Wrap(dnsErr, "get pgbouncer service DNS names")
 			}

internal/controller/postgrescluster/pki.go

@@ -340,11 +340,11 @@ func (r *Reconciler) reconcileCertManagerClusterCertificate(
 		return nil, errors.Wrap(err, "failed to apply TLS issuer")
 	}
 
-	primaryDNSNames, err := naming.ServiceDNSNames(ctx, primaryService)
+	primaryDNSNames, err := naming.ServiceDNSNames(ctx, primaryService, cluster.Spec.ClusterServiceDNSSuffix)
 	if err != nil {
 		return nil, errors.Wrap(err, "get primary service DNS names")
 	}
-	replicaDNSNames, err := naming.ServiceDNSNames(ctx, replicaService)
+	replicaDNSNames, err := naming.ServiceDNSNames(ctx, replicaService, cluster.Spec.ClusterServiceDNSSuffix)
 	if err != nil {
 		return nil, errors.Wrap(err, "get replica service DNS names")
 	}