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 1 commit
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
Prev Previous commit
Next Next commit
updated controller logic to use upstream type
  • Loading branch information
Philip Hurst committed Jan 28, 2025
commit 1cec5eb0d8f54d036792c6dc789517526bcc275d
5 changes: 2 additions & 3 deletions internal/controller/postgrescluster/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,14 +269,13 @@
service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy

// Set IPFamilyPolicy and IPFamilies
if spec.IPFamilyPolicy != "" {
policy := corev1.IPFamilyPolicyType(spec.IPFamilyPolicy)
service.Spec.IPFamilyPolicy = &policy
if spec.IPFamilyPolicy != nil {
service.Spec.IPFamilyPolicy = spec.IPFamilyPolicy
}
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))

Check failure on line 278 in internal/controller/postgrescluster/cluster.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

unnecessary conversion (unconvert)
}
}

Expand Down
5 changes: 2 additions & 3 deletions internal/controller/postgrescluster/patroni.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,8 @@ func (r *Reconciler) generatePatroniLeaderLeaseService(
service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy

// Set IPFamilyPolicy and IPFamilies
if spec.IPFamilyPolicy != "" {
policy := corev1.IPFamilyPolicyType(spec.IPFamilyPolicy)
service.Spec.IPFamilyPolicy = &policy
if spec.IPFamilyPolicy != nil {
service.Spec.IPFamilyPolicy = spec.IPFamilyPolicy
}
if len(spec.IPFamilies) > 0 {
service.Spec.IPFamilies = []corev1.IPFamily{}
Expand Down
5 changes: 2 additions & 3 deletions internal/controller/postgrescluster/pgadmin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,14 +185,13 @@
service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy

// Set IPFamilyPolicy and IPFamilies
if spec.IPFamilyPolicy != "" {
policy := corev1.IPFamilyPolicyType(spec.IPFamilyPolicy)
service.Spec.IPFamilyPolicy = &policy
if spec.IPFamilyPolicy != nil {
service.Spec.IPFamilyPolicy = spec.IPFamilyPolicy
}
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))

Check failure on line 194 in internal/controller/postgrescluster/pgadmin.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

unnecessary conversion (unconvert)
}
}
}
Expand Down
5 changes: 2 additions & 3 deletions internal/controller/postgrescluster/pgbouncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,14 +308,13 @@
service.Spec.InternalTrafficPolicy = spec.InternalTrafficPolicy

// Set IPFamilyPolicy and IPFamilies
if spec.IPFamilyPolicy != "" {
policy := corev1.IPFamilyPolicyType(spec.IPFamilyPolicy)
service.Spec.IPFamilyPolicy = &policy
if spec.IPFamilyPolicy != nil {
service.Spec.IPFamilyPolicy = spec.IPFamilyPolicy
}
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))

Check failure on line 317 in internal/controller/postgrescluster/pgbouncer.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

unnecessary conversion (unconvert)
}
}
}
Expand Down
Loading