Skip to content

Add support for IP Family Policy and IP Families #4076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
philrhurst merged 14 commits into from
Jan 29, 2025
Merged

Add support for IP Family Policy and IP Families #4076

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
01913ec
add IP Family Policy to CRD
Jan 14, 2025
8900ba8
update controller logic for IP Family Policy
Jan 14, 2025
f8d3112
added IPFamilies to the CRD
Jan 22, 2025
0bdcb71
update controller logic for IP Families and IP Family Policy
Jan 22, 2025
82a0cd6
Merge pull request #1 from philrhurst/dev
philrhurst Jan 22, 2025
b0c8385
Merge pull request #2 from CrunchyData/main
philrhurst Jan 22, 2025
6eecd0b
update enum validation for IPFamily
Jan 22, 2025
c39bc04
Merge pull request #3 from CrunchyData/main
philrhurst Jan 22, 2025
08bff2a
Merge pull request #4 from philrhurst/dev
philrhurst Jan 22, 2025
dbd60a1
update to enum for IP Families
Jan 22, 2025
f3784b3
Merge pull request #5 from philrhurst/dev
philrhurst Jan 22, 2025
1249fe7
refactor to use the upstream type
Jan 28, 2025
1cec5eb
updated controller logic to use upstream type
Jan 28, 2025
4c4ec0c
simplified IP Family assignment
Jan 28, 2025
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
56 changes: 56 additions & 0 deletions config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14663,6 +14663,20 @@ spec:
- Local
maxLength: 10
type: string
ipFamilies:
items:
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 +15019,20 @@ spec:
- Local
maxLength: 10
type: string
ipFamilies:
items:
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 +15081,20 @@ spec:
- Local
maxLength: 10
type: string
ipFamilies:
items:
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 +16791,20 @@ spec:
- Local
maxLength: 10
type: string
ipFamilies:
items:
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
13 changes: 13 additions & 0 deletions internal/controller/postgrescluster/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,19 @@ func (r *Reconciler) generateClusterReplicaService(
}
service.Spec.ExternalTrafficPolicy = initialize.FromPointer(spec.ExternalTrafficPolicy)
service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy

// 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.Ports = []corev1.ServicePort{servicePort}

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

// 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.Ports = []corev1.ServicePort{servicePort}

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

// 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.Ports = []corev1.ServicePort{servicePort}

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

// 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{}
Copy link
Member

@cbandy cbandy Jan 28, 2025

Choose a reason for hiding this comment

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

📝 If the Go types in the CRD structs can change, these assignments might reduce to service.Spec... = spec....

Copy link
Contributor Author

@philrhurst philrhurst Jan 28, 2025

Choose a reason for hiding this comment

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

yes - this one simplified also - thanks for the suggestion

for _, family := range spec.IPFamilies {
service.Spec.IPFamilies = append(service.Spec.IPFamilies, corev1.IPFamily(family))
}
}
}
service.Spec.Ports = []corev1.ServicePort{servicePort}

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

}

// +kubebuilder:validation:Enum=IPv4;IPv6
type IPFamily string

type ServiceSpec struct {
// +optional
Metadata *Metadata `json:"metadata,omitempty"`
Expand All @@ -44,6 +48,15 @@ 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 string `json:"ipFamilyPolicy,omitempty"`
Copy link
Member

@cbandy cbandy Jan 28, 2025

Choose a reason for hiding this comment

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

❓ I think we can avoid the type conversions in the controller if we use the upstream type here. Similar regarding pointer. Does this generate the same YAML?

Suggested change
IPFamilyPolicy string `json:"ipFamilyPolicy,omitempty"`
IPFamilyPolicy *corev1.IPFamilyPolicy `json:"ipFamilyPolicy,omitempty"`

Copy link
Contributor Author

@philrhurst philrhurst Jan 28, 2025

Choose a reason for hiding this comment

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

yes it does - thanks - refactoring


// +optional
IPFamilies []IPFamily `json:"ipFamilies,omitempty"`
Copy link
Member

@cbandy cbandy Jan 28, 2025

Choose a reason for hiding this comment

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

❓ We should be able to use the upstream type and add the enum validation from here. Does this generate the same YAML?

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

Copy link
Contributor Author

@philrhurst philrhurst Jan 28, 2025

Choose a reason for hiding this comment

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

yes it does - thanks - refactoring


// 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
5 changes: 5 additions & 0 deletions pkg/apis/postgres-operator.crunchydata.com/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

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

Loading