Skip to content

Add IP Family Policy and IP Families to CRD for Services #1

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
merged 4 commits into from
Jan 22, 2025
Merged

Add IP Family Policy and IP Families to CRD for Services #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 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
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
60 changes: 60 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,21 @@ spec:
- Local
maxLength: 10
type: string
ipFamilies:
items:
enum:
- IPv4
- IPv6
- foo
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 +15020,21 @@ spec:
- Local
maxLength: 10
type: string
ipFamilies:
items:
enum:
- IPv4
- IPv6
- foo
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 +15083,21 @@ spec:
- Local
maxLength: 10
type: string
ipFamilies:
items:
enum:
- IPv4
- IPv6
- foo
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 +16794,21 @@ spec:
- Local
maxLength: 10
type: string
ipFamilies:
items:
enum:
- IPv4
- IPv6
- foo
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{}
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;foo
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"`

// +optional
IPFamilies []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
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.