update controller logic for IP Families and IP Family Policy

Author: Philip Hurst

internal/controller/postgrescluster/cluster.go

@@ -268,11 +268,17 @@ func (r *Reconciler) generateClusterReplicaService(
 		service.Spec.ExternalTrafficPolicy = initialize.FromPointer(spec.ExternalTrafficPolicy)
 		service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy
 
-		// Default to SingleStack if IP Family Policy is not defined
-		if spec.IPFamilyPolicy == "" {
-			spec.IPFamilyPolicy = "SingleStack"
+		// Set IPFamilyPolicy and IPFamilies
+		if spec.IPFamilyPolicy != "" {
+			policy := corev1.IPFamilyPolicyType(spec.IPFamilyPolicy)
+			service.Spec.IPFamilyPolicy = &policy
+		}
+		if len(spec.IPFamilies) > 0 {
+			service.Spec.IPFamilies = []corev1.IPFamily{}
+			for _, family := range spec.IPFamilies {
+				service.Spec.IPFamilies = append(service.Spec.IPFamilies, corev1.IPFamily(family))
+			}
 		}
-		service.Spec.IPFamilyPolicy = (*corev1.IPFamilyPolicy)(&spec.IPFamilyPolicy)
 
 	}
 	service.Spec.Ports = []corev1.ServicePort{servicePort}

internal/controller/postgrescluster/patroni.go

@@ -272,11 +272,17 @@ func (r *Reconciler) generatePatroniLeaderLeaseService(
 		service.Spec.ExternalTrafficPolicy = initialize.FromPointer(spec.ExternalTrafficPolicy)
 		service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy
 
-		// Default to SingleStack if IP Family Policy is not defined
-		if spec.IPFamilyPolicy == "" {
-			spec.IPFamilyPolicy = "SingleStack"
+		// Set IPFamilyPolicy and IPFamilies
+		if spec.IPFamilyPolicy != "" {
+			policy := corev1.IPFamilyPolicyType(spec.IPFamilyPolicy)
+			service.Spec.IPFamilyPolicy = &policy
+		}
+		if len(spec.IPFamilies) > 0 {
+			service.Spec.IPFamilies = []corev1.IPFamily{}
+			for _, family := range spec.IPFamilies {
+				service.Spec.IPFamilies = append(service.Spec.IPFamilies, corev1.IPFamily(family))
+			}
 		}
-		service.Spec.IPFamilyPolicy = (*corev1.IPFamilyPolicy)(&spec.IPFamilyPolicy)
 	}
 	service.Spec.Ports = []corev1.ServicePort{servicePort}
 

internal/controller/postgrescluster/pgadmin.go

@@ -184,11 +184,17 @@ func (r *Reconciler) generatePGAdminService(
 		service.Spec.ExternalTrafficPolicy = initialize.FromPointer(spec.ExternalTrafficPolicy)
 		service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy
 
-		// Default to SingleStack if IP Family Policy is not defined
-		if spec.IPFamilyPolicy == "" {
-			spec.IPFamilyPolicy = "SingleStack"
+		// Set IPFamilyPolicy and IPFamilies
+		if spec.IPFamilyPolicy != "" {
+			policy := corev1.IPFamilyPolicyType(spec.IPFamilyPolicy)
+			service.Spec.IPFamilyPolicy = &policy
+		}
+		if len(spec.IPFamilies) > 0 {
+			service.Spec.IPFamilies = []corev1.IPFamily{}
+			for _, family := range spec.IPFamilies {
+				service.Spec.IPFamilies = append(service.Spec.IPFamilies, corev1.IPFamily(family))
+			}
 		}
-		service.Spec.IPFamilyPolicy = (*corev1.IPFamilyPolicy)(&spec.IPFamilyPolicy)
 	}
 	service.Spec.Ports = []corev1.ServicePort{servicePort}
 

internal/controller/postgrescluster/pgbouncer.go

@@ -307,11 +307,17 @@ func (r *Reconciler) generatePGBouncerService(
 		service.Spec.ExternalTrafficPolicy = initialize.FromPointer(spec.ExternalTrafficPolicy)
 		service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy
 
-		// Default to SingleStack if IP Family Policy is not defined
-		if spec.IPFamilyPolicy == "" {
-			spec.IPFamilyPolicy = "SingleStack"
+		// Set IPFamilyPolicy and IPFamilies
+		if spec.IPFamilyPolicy != "" {
+			policy := corev1.IPFamilyPolicyType(spec.IPFamilyPolicy)
+			service.Spec.IPFamilyPolicy = &policy
+		}
+		if len(spec.IPFamilies) > 0 {
+			service.Spec.IPFamilies = []corev1.IPFamily{}
+			for _, family := range spec.IPFamilies {
+				service.Spec.IPFamilies = append(service.Spec.IPFamilies, corev1.IPFamily(family))
+			}
 		}
-		service.Spec.IPFamilyPolicy = (*corev1.IPFamilyPolicy)(&spec.IPFamilyPolicy)
 	}
 	service.Spec.Ports = []corev1.ServicePort{servicePort}