Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14663,6 +14663,23 @@ spec:
- Local
maxLength: 10
type: string
ipFamilies:
items:
description: |-
IPFamily represents the IP Family (IPv4 or IPv6). This type is used
to express the family of an IP expressed by a type (e.g. service.spec.ipFamilies).
enum:
- IPv4
- IPv6
type: string
type: array
ipFamilyPolicy:
description: 'More info: https://kubernetes.io/docs/reference/kubernetes-api/service-resources/service-v1/'
enum:
- SingleStack
- PreferDualStack
- RequireDualStack
type: string
metadata:
description: Metadata contains metadata for custom resources
properties:
Expand Down Expand Up @@ -15005,6 +15022,23 @@ spec:
- Local
maxLength: 10
type: string
ipFamilies:
items:
description: |-
IPFamily represents the IP Family (IPv4 or IPv6). This type is used
to express the family of an IP expressed by a type (e.g. service.spec.ipFamilies).
enum:
- IPv4
- IPv6
type: string
type: array
ipFamilyPolicy:
description: 'More info: https://kubernetes.io/docs/reference/kubernetes-api/service-resources/service-v1/'
enum:
- SingleStack
- PreferDualStack
- RequireDualStack
type: string
metadata:
description: Metadata contains metadata for custom resources
properties:
Expand Down Expand Up @@ -15053,6 +15087,23 @@ spec:
- Local
maxLength: 10
type: string
ipFamilies:
items:
description: |-
IPFamily represents the IP Family (IPv4 or IPv6). This type is used
to express the family of an IP expressed by a type (e.g. service.spec.ipFamilies).
enum:
- IPv4
- IPv6
type: string
type: array
ipFamilyPolicy:
description: 'More info: https://kubernetes.io/docs/reference/kubernetes-api/service-resources/service-v1/'
enum:
- SingleStack
- PreferDualStack
- RequireDualStack
type: string
metadata:
description: Metadata contains metadata for custom resources
properties:
Expand Down Expand Up @@ -16749,6 +16800,23 @@ spec:
- Local
maxLength: 10
type: string
ipFamilies:
items:
description: |-
IPFamily represents the IP Family (IPv4 or IPv6). This type is used
to express the family of an IP expressed by a type (e.g. service.spec.ipFamilies).
enum:
- IPv4
- IPv6
type: string
type: array
ipFamilyPolicy:
description: 'More info: https://kubernetes.io/docs/reference/kubernetes-api/service-resources/service-v1/'
enum:
- SingleStack
- PreferDualStack
- RequireDualStack
type: string
metadata:
description: Metadata contains metadata for custom resources
properties:
Expand Down
9 changes: 9 additions & 0 deletions internal/controller/postgrescluster/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,15 @@ func (r *Reconciler) generateClusterReplicaService(
}
service.Spec.ExternalTrafficPolicy = initialize.FromPointer(spec.ExternalTrafficPolicy)
service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy

// Set IPFamilyPolicy and IPFamilies
if spec.IPFamilyPolicy != nil {
service.Spec.IPFamilyPolicy = spec.IPFamilyPolicy
}
if len(spec.IPFamilies) > 0 {
service.Spec.IPFamilies = spec.IPFamilies
}
Comment on lines +272 to +277
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⛏️ No need to check len or nil.


}
service.Spec.Ports = []corev1.ServicePort{servicePort}

Expand Down
8 changes: 8 additions & 0 deletions internal/controller/postgrescluster/patroni.go
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,14 @@ func (r *Reconciler) generatePatroniLeaderLeaseService(
}
service.Spec.ExternalTrafficPolicy = initialize.FromPointer(spec.ExternalTrafficPolicy)
service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy

// Set IPFamilyPolicy and IPFamilies
if spec.IPFamilyPolicy != nil {
service.Spec.IPFamilyPolicy = spec.IPFamilyPolicy
}
if len(spec.IPFamilies) > 0 {
service.Spec.IPFamilies = spec.IPFamilies
}
}
service.Spec.Ports = []corev1.ServicePort{servicePort}

Expand Down
8 changes: 8 additions & 0 deletions internal/controller/postgrescluster/pgadmin.go
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,14 @@ func (r *Reconciler) generatePGAdminService(
}
service.Spec.ExternalTrafficPolicy = initialize.FromPointer(spec.ExternalTrafficPolicy)
service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy

// Set IPFamilyPolicy and IPFamilies
if spec.IPFamilyPolicy != nil {
service.Spec.IPFamilyPolicy = spec.IPFamilyPolicy
}
if len(spec.IPFamilies) > 0 {
service.Spec.IPFamilies = spec.IPFamilies
}
}
service.Spec.Ports = []corev1.ServicePort{servicePort}

Expand Down
8 changes: 8 additions & 0 deletions internal/controller/postgrescluster/pgbouncer.go
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,14 @@ func (r *Reconciler) generatePGBouncerService(
}
service.Spec.ExternalTrafficPolicy = initialize.FromPointer(spec.ExternalTrafficPolicy)
service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy

// Set IPFamilyPolicy and IPFamilies
if spec.IPFamilyPolicy != nil {
service.Spec.IPFamilyPolicy = spec.IPFamilyPolicy
}
if len(spec.IPFamilies) > 0 {
service.Spec.IPFamilies = spec.IPFamilies
}
}
service.Spec.Ports = []corev1.ServicePort{servicePort}

Expand Down
11 changes: 11 additions & 0 deletions pkg/apis/postgres-operator.crunchydata.com/v1beta1/shared_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ type SchemalessObject map[string]any
// DeepCopy creates a new SchemalessObject by copying the receiver.
func (in SchemalessObject) DeepCopy() SchemalessObject {
return runtime.DeepCopyJSON(in)

}

type ServiceSpec struct {
Expand All @@ -44,6 +45,16 @@ type ServiceSpec struct {
// +kubebuilder:validation:Enum={ClusterIP,NodePort,LoadBalancer}
Type string `json:"type"`

// More info: https://kubernetes.io/docs/reference/kubernetes-api/service-resources/service-v1/
// ---
// +optional
// +kubebuilder:validation:Enum=SingleStack;PreferDualStack;RequireDualStack
IPFamilyPolicy *corev1.IPFamilyPolicy `json:"ipFamilyPolicy,omitempty"`

// +optional
// +kubebuilder:validation:items:Enum={IPv4,IPv6}
IPFamilies []corev1.IPFamily `json:"ipFamilies,omitempty"`

// More info: https://kubernetes.io/docs/concepts/services-networking/service/#traffic-policies
// ---
// Kubernetes assumes the evaluation cost of an enum value is very large.
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.