Set service traffic policy on replica service

cbandy · baptman21 · cbandy · commit 66174ec98044 · 2024-09-27T13:29:34.000Z
Co-authored-by: Baptiste Bourdet <bat.bourdet@gmail.com> Issue: PGO-1659 See: #3812
diff --git a/internal/controller/postgrescluster/cluster.go b/internal/controller/postgrescluster/cluster.go
@@ -15,6 +15,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 
+	"github.com/crunchydata/postgres-operator/internal/initialize"
 	"github.com/crunchydata/postgres-operator/internal/naming"
 	"github.com/crunchydata/postgres-operator/internal/patroni"
 	"github.com/crunchydata/postgres-operator/internal/pki"
@@ -237,6 +238,8 @@ func (r *Reconciler) generateClusterReplicaService(
 			}
 			servicePort.NodePort = *spec.NodePort
 		}
+		service.Spec.ExternalTrafficPolicy = initialize.FromPointer(spec.ExternalTrafficPolicy)
+		service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy
 	}
 	service.Spec.Ports = []corev1.ServicePort{servicePort}
 
diff --git a/internal/controller/postgrescluster/patroni.go b/internal/controller/postgrescluster/patroni.go
@@ -274,6 +274,8 @@ func (r *Reconciler) generatePatroniLeaderLeaseService(
 			}
 			servicePort.NodePort = *spec.NodePort
 		}
+		service.Spec.ExternalTrafficPolicy = initialize.FromPointer(spec.ExternalTrafficPolicy)
+		service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy
 	}
 	service.Spec.Ports = []corev1.ServicePort{servicePort}
 
diff --git a/internal/controller/postgrescluster/pgadmin.go b/internal/controller/postgrescluster/pgadmin.go
@@ -181,6 +181,8 @@ func (r *Reconciler) generatePGAdminService(
 			}
 			servicePort.NodePort = *spec.NodePort
 		}
+		service.Spec.ExternalTrafficPolicy = initialize.FromPointer(spec.ExternalTrafficPolicy)
+		service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy
 	}
 	service.Spec.Ports = []corev1.ServicePort{servicePort}
 
diff --git a/internal/controller/postgrescluster/pgbouncer.go b/internal/controller/postgrescluster/pgbouncer.go
@@ -304,12 +304,8 @@ func (r *Reconciler) generatePGBouncerService(
 			}
 			servicePort.NodePort = *spec.NodePort
 		}
-		if spec.ExternalTrafficPolicy != nil {
-			service.Spec.ExternalTrafficPolicy = *spec.ExternalTrafficPolicy
-		}
-		if spec.InternalTrafficPolicy != nil {
-			service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy
-		}
+		service.Spec.ExternalTrafficPolicy = initialize.FromPointer(spec.ExternalTrafficPolicy)
+		service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy
 	}
 	service.Spec.Ports = []corev1.ServicePort{servicePort}
 

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ import (`
`15`	`15`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`16`	`16`	`"k8s.io/apimachinery/pkg/util/intstr"`
`17`	`17`
	`18`	`+ "github.com/crunchydata/postgres-operator/internal/initialize"`
`18`	`19`	`"github.com/crunchydata/postgres-operator/internal/naming"`
`19`	`20`	`"github.com/crunchydata/postgres-operator/internal/patroni"`
`20`	`21`	`"github.com/crunchydata/postgres-operator/internal/pki"`
`@@ -237,6 +238,8 @@ func (r *Reconciler) generateClusterReplicaService(`
`237`	`238`	`}`
`238`	`239`	`servicePort.NodePort = *spec.NodePort`
`239`	`240`	`}`
	`241`	`+ service.Spec.ExternalTrafficPolicy = initialize.FromPointer(spec.ExternalTrafficPolicy)`
	`242`	`+ service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy`
`240`	`243`	`}`
`241`	`244`	`service.Spec.Ports = []corev1.ServicePort{servicePort}`
`242`	`245`
Original file line number	Diff line number	Diff line change
`@@ -274,6 +274,8 @@ func (r *Reconciler) generatePatroniLeaderLeaseService(`
`274`	`274`	`}`
`275`	`275`	`servicePort.NodePort = *spec.NodePort`
`276`	`276`	`}`
	`277`	`+ service.Spec.ExternalTrafficPolicy = initialize.FromPointer(spec.ExternalTrafficPolicy)`
	`278`	`+ service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy`
`277`	`279`	`}`
`278`	`280`	`service.Spec.Ports = []corev1.ServicePort{servicePort}`
`279`	`281`
Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,8 @@ func (r *Reconciler) generatePGAdminService(`
`181`	`181`	`}`
`182`	`182`	`servicePort.NodePort = *spec.NodePort`
`183`	`183`	`}`
	`184`	`+ service.Spec.ExternalTrafficPolicy = initialize.FromPointer(spec.ExternalTrafficPolicy)`
	`185`	`+ service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy`
`184`	`186`	`}`
`185`	`187`	`service.Spec.Ports = []corev1.ServicePort{servicePort}`
`186`	`188`
Original file line number	Diff line number	Diff line change
`@@ -304,12 +304,8 @@ func (r *Reconciler) generatePGBouncerService(`
`304`	`304`	`}`
`305`	`305`	`servicePort.NodePort = *spec.NodePort`
`306`	`306`	`}`
`307`		`- if spec.ExternalTrafficPolicy != nil {`
`308`		`- service.Spec.ExternalTrafficPolicy = *spec.ExternalTrafficPolicy`
`309`		`- }`
`310`		`- if spec.InternalTrafficPolicy != nil {`
`311`		`- service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy`
`312`		`- }`
	`307`	`+ service.Spec.ExternalTrafficPolicy = initialize.FromPointer(spec.ExternalTrafficPolicy)`
	`308`	`+ service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy`
`313`	`309`	`}`
`314`	`310`	`service.Spec.Ports = []corev1.ServicePort{servicePort}`
`315`	`311`