Skip to content

Commit 66174ec

Browse files
cbandybaptman21
andcommitted
Set service traffic policy on replica service
Co-authored-by: Baptiste Bourdet <[email protected]> Issue: PGO-1659 See: #3812
1 parent 34a3eee commit 66174ec

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

internal/controller/postgrescluster/cluster.go

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1616
"k8s.io/apimachinery/pkg/util/intstr"
1717

18+
"github.com/crunchydata/postgres-operator/internal/initialize"
1819
"github.com/crunchydata/postgres-operator/internal/naming"
1920
"github.com/crunchydata/postgres-operator/internal/patroni"
2021
"github.com/crunchydata/postgres-operator/internal/pki"
@@ -237,6 +238,8 @@ func (r *Reconciler) generateClusterReplicaService(
237238
}
238239
servicePort.NodePort = *spec.NodePort
239240
}
241+
service.Spec.ExternalTrafficPolicy = initialize.FromPointer(spec.ExternalTrafficPolicy)
242+
service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy
240243
}
241244
service.Spec.Ports = []corev1.ServicePort{servicePort}
242245

internal/controller/postgrescluster/patroni.go

+2
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,8 @@ func (r *Reconciler) generatePatroniLeaderLeaseService(
274274
}
275275
servicePort.NodePort = *spec.NodePort
276276
}
277+
service.Spec.ExternalTrafficPolicy = initialize.FromPointer(spec.ExternalTrafficPolicy)
278+
service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy
277279
}
278280
service.Spec.Ports = []corev1.ServicePort{servicePort}
279281

internal/controller/postgrescluster/pgadmin.go

+2
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@ func (r *Reconciler) generatePGAdminService(
181181
}
182182
servicePort.NodePort = *spec.NodePort
183183
}
184+
service.Spec.ExternalTrafficPolicy = initialize.FromPointer(spec.ExternalTrafficPolicy)
185+
service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy
184186
}
185187
service.Spec.Ports = []corev1.ServicePort{servicePort}
186188

internal/controller/postgrescluster/pgbouncer.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -304,12 +304,8 @@ func (r *Reconciler) generatePGBouncerService(
304304
}
305305
servicePort.NodePort = *spec.NodePort
306306
}
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
313309
}
314310
service.Spec.Ports = []corev1.ServicePort{servicePort}
315311

0 commit comments

Comments
 (0)