Skip to content

Commit 8b3410a

Browse files
committed
Allow users to set ssl_groups or ssl_ecdh_curve via spec.config.parameters.
1 parent a032a33 commit 8b3410a

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5063,7 +5063,8 @@ spec:
50635063
- message: change port using .spec.port instead
50645064
rule: '!has(self.port)'
50655065
- message: TLS is always enabled
5066-
rule: '!has(self.ssl) && !self.exists(k, k.startsWith("ssl_"))'
5066+
rule: '!has(self.ssl) && !self.exists(k, k.startsWith("ssl_")
5067+
&& !(k == ''ssl_groups'' || k == ''ssl_ecdh_curve''))'
50675068
- message: domain socket paths cannot be changed
50685069
rule: '!self.exists(k, k.startsWith("unix_socket_"))'
50695070
- message: wal_level must be "replica" or higher
@@ -24149,7 +24150,8 @@ spec:
2414924150
- message: change port using .spec.port instead
2415024151
rule: '!has(self.port)'
2415124152
- message: TLS is always enabled
24152-
rule: '!has(self.ssl) && !self.exists(k, k.startsWith("ssl_"))'
24153+
rule: '!has(self.ssl) && !self.exists(k, k.startsWith("ssl_")
24154+
&& !(k == ''ssl_groups'' || k == ''ssl_ecdh_curve''))'
2415324155
- message: domain socket paths cannot be changed
2415424156
rule: '!self.exists(k, k.startsWith("unix_socket_"))'
2415524157
- message: wal_level must be "replica" or higher

pkg/apis/postgres-operator.crunchydata.com/v1/postgres_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ type PostgresConfigSpec struct {
3737
//
3838
// +kubebuilder:validation:XValidation:rule=`!has(self.listen_addresses)`,message=`network connectivity is always enabled: listen_addresses`
3939
// +kubebuilder:validation:XValidation:rule=`!has(self.port)`,message=`change port using .spec.port instead`
40-
// +kubebuilder:validation:XValidation:rule=`!has(self.ssl) && !self.exists(k, k.startsWith("ssl_"))`,message=`TLS is always enabled`
40+
// +kubebuilder:validation:XValidation:rule=`!has(self.ssl) && !self.exists(k, k.startsWith("ssl_") && !(k == 'ssl_groups' || k == 'ssl_ecdh_curve'))`,message=`TLS is always enabled`
4141
// +kubebuilder:validation:XValidation:rule=`!self.exists(k, k.startsWith("unix_socket_"))`,message=`domain socket paths cannot be changed`
4242
//
4343
// # Write Ahead Log

pkg/apis/postgres-operator.crunchydata.com/v1beta1/postgres_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ type PostgresConfigSpec struct {
5454
//
5555
// +kubebuilder:validation:XValidation:rule=`!has(self.listen_addresses)`,message=`network connectivity is always enabled: listen_addresses`
5656
// +kubebuilder:validation:XValidation:rule=`!has(self.port)`,message=`change port using .spec.port instead`
57-
// +kubebuilder:validation:XValidation:rule=`!has(self.ssl) && !self.exists(k, k.startsWith("ssl_"))`,message=`TLS is always enabled`
57+
// +kubebuilder:validation:XValidation:rule=`!has(self.ssl) && !self.exists(k, k.startsWith("ssl_") && !(k == 'ssl_groups' || k == 'ssl_ecdh_curve'))`,message=`TLS is always enabled`
5858
// +kubebuilder:validation:XValidation:rule=`!self.exists(k, k.startsWith("unix_socket_"))`,message=`domain socket paths cannot be changed`
5959
//
6060
// # Write Ahead Log

0 commit comments

Comments
 (0)