Skip to content

Commit 4c4ec0c

Browse files
author
Philip Hurst
committed
simplified IP Family assignment
1 parent 1cec5eb commit 4c4ec0c

File tree

4 files changed

+4
-16
lines changed

4 files changed

+4
-16
lines changed

internal/controller/postgrescluster/cluster.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,10 +273,7 @@ func (r *Reconciler) generateClusterReplicaService(
273273
service.Spec.IPFamilyPolicy = spec.IPFamilyPolicy
274274
}
275275
if len(spec.IPFamilies) > 0 {
276-
service.Spec.IPFamilies = []corev1.IPFamily{}
277-
for _, family := range spec.IPFamilies {
278-
service.Spec.IPFamilies = append(service.Spec.IPFamilies, corev1.IPFamily(family))
279-
}
276+
service.Spec.IPFamilies = spec.IPFamilies
280277
}
281278

282279
}

internal/controller/postgrescluster/patroni.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -277,10 +277,7 @@ func (r *Reconciler) generatePatroniLeaderLeaseService(
277277
service.Spec.IPFamilyPolicy = spec.IPFamilyPolicy
278278
}
279279
if len(spec.IPFamilies) > 0 {
280-
service.Spec.IPFamilies = []corev1.IPFamily{}
281-
for _, family := range spec.IPFamilies {
282-
service.Spec.IPFamilies = append(service.Spec.IPFamilies, corev1.IPFamily(family))
283-
}
280+
service.Spec.IPFamilies = spec.IPFamilies
284281
}
285282
}
286283
service.Spec.Ports = []corev1.ServicePort{servicePort}

internal/controller/postgrescluster/pgadmin.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,10 +189,7 @@ func (r *Reconciler) generatePGAdminService(
189189
service.Spec.IPFamilyPolicy = spec.IPFamilyPolicy
190190
}
191191
if len(spec.IPFamilies) > 0 {
192-
service.Spec.IPFamilies = []corev1.IPFamily{}
193-
for _, family := range spec.IPFamilies {
194-
service.Spec.IPFamilies = append(service.Spec.IPFamilies, corev1.IPFamily(family))
195-
}
192+
service.Spec.IPFamilies = spec.IPFamilies
196193
}
197194
}
198195
service.Spec.Ports = []corev1.ServicePort{servicePort}

internal/controller/postgrescluster/pgbouncer.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -312,10 +312,7 @@ func (r *Reconciler) generatePGBouncerService(
312312
service.Spec.IPFamilyPolicy = spec.IPFamilyPolicy
313313
}
314314
if len(spec.IPFamilies) > 0 {
315-
service.Spec.IPFamilies = []corev1.IPFamily{}
316-
for _, family := range spec.IPFamilies {
317-
service.Spec.IPFamilies = append(service.Spec.IPFamilies, corev1.IPFamily(family))
318-
}
315+
service.Spec.IPFamilies = spec.IPFamilies
319316
}
320317
}
321318
service.Spec.Ports = []corev1.ServicePort{servicePort}

0 commit comments

Comments
 (0)