Skip to content

sync with upstream #6

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

sync with upstream #6

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb08b6f
Improve the pgBackRest repo host RBAC test
tjmoore4 Jan 27, 2025
c940bde
post-release updates
ValClarkson Jan 27, 2025
072a19d
Reconcile cronjobs with cluster config file (#4075)
caitlinstrong Jan 28, 2025
740400d
Add support for IP Family Policy and IP Families (#4076)
philrhurst Jan 29, 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
Add support for IP Family Policy and IP Families (CrunchyData#4076) 
* add IP Family Policy to CRD

* update controller logic for IP Family Policy

* added IPFamilies to the CRD

* update  controller logic for IP Families and IP Family Policy

* update enum validation for IPFamily

* update to enum for IP Families

* refactor to use the upstream type

* updated controller logic to use upstream type

* simplified IP Family assignment

---------

Co-authored-by: Philip Hurst <[email protected]>
  • Loading branch information
@philrhurst
philrhurst and Philip Hurst authored Jan 29, 2025
commit 740400d7f70b42385528a23cc55790004e46114b
68 changes: 68 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,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
View file
Open in desktop
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
}

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

Expand Down
8 changes: 8 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,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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
10 changes: 10 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.