Skip to content

Commit db13556

Browse files
egegunesegegunes
committed
fix validations
1 parent ef2e0a8 commit db13556

File tree

9 files changed

+54
-42
lines changed

9 files changed

+54
-42
lines changed

‎build/crd/crunchy/generated/postgres-operator.crunchydata.com_postgresclusters.yaml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11381,7 +11381,8 @@ spec:
1138111381
type: object
1138211382
x-kubernetes-validations:
1138311383
- message: vault is required for enabling pg_tde
11384-
rule: '!self.enabled || has(self.vault)'
11384+
rule: '!has(self.enabled) || (has(self.enabled) && self.enabled
11385+
== false) || has(self.vault)'
1138511386
pgAudit:
1138611387
type: boolean
1138711388
pgRepack:
@@ -11394,10 +11395,10 @@ spec:
1139411395
type: boolean
1139511396
type: object
1139611397
x-kubernetes-validations:
11397-
- message: to disable pg_tde first set enabled=false and wait for
11398-
pod restarts
11399-
rule: '!has(oldSelf.pg_tde.vault) || !oldSelf.pg_tde.enabled ||
11400-
has(self.pg_tde.vault)'
11398+
- message: to disable pg_tde first set enabled=false without removing
11399+
vault and wait for pod restarts
11400+
rule: '!has(oldSelf.pg_tde.vault) || !has(oldSelf.pg_tde.enabled)
11401+
|| !oldSelf.pg_tde.enabled || has(self.pg_tde.vault)'
1140111402
image:
1140211403
description: |-
1140311404
The image name to use for PostgreSQL containers. When omitted, the value

‎build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11083,7 +11083,8 @@ spec:
1108311083
type: object
1108411084
x-kubernetes-validations:
1108511085
- message: vault is required for enabling pg_tde
11086-
rule: '!self.enabled || has(self.vault)'
11086+
rule: '!has(self.enabled) || (has(self.enabled) && self.enabled
11087+
== false) || has(self.vault)'
1108711088
pgvector:
1108811089
properties:
1108911090
enabled:
@@ -11172,8 +11173,8 @@ spec:
1117211173
type: object
1117311174
type: object
1117411175
x-kubernetes-validations:
11175-
- message: to disable pg_tde first set enabled=false and wait for
11176-
pod restarts
11176+
- message: to disable pg_tde first set enabled=false without removing
11177+
vault and wait for pod restarts
1117711178
rule: '!has(oldSelf.pg_tde.vault) || !oldSelf.pg_tde.enabled ||
1117811179
has(self.pg_tde.vault)'
1117911180
image:

‎config/crd/bases/pgv2.percona.com_perconapgclusters.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11722,7 +11722,8 @@ spec:
1172211722
type: object
1172311723
x-kubernetes-validations:
1172411724
- message: vault is required for enabling pg_tde
11725-
rule: '!self.enabled || has(self.vault)'
11725+
rule: '!has(self.enabled) || (has(self.enabled) && self.enabled
11726+
== false) || has(self.vault)'
1172611727
pgvector:
1172711728
properties:
1172811729
enabled:
@@ -11811,8 +11812,8 @@ spec:
1181111812
type: object
1181211813
type: object
1181311814
x-kubernetes-validations:
11814-
- message: to disable pg_tde first set enabled=false and wait for
11815-
pod restarts
11815+
- message: to disable pg_tde first set enabled=false without removing
11816+
vault and wait for pod restarts
1181611817
rule: '!has(oldSelf.pg_tde.vault) || !oldSelf.pg_tde.enabled ||
1181711818
has(self.pg_tde.vault)'
1181811819
image:

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11341,7 +11341,8 @@ spec:
1134111341
type: object
1134211342
x-kubernetes-validations:
1134311343
- message: vault is required for enabling pg_tde
11344-
rule: '!self.enabled || has(self.vault)'
11344+
rule: '!has(self.enabled) || (has(self.enabled) && self.enabled
11345+
== false) || has(self.vault)'
1134511346
pgAudit:
1134611347
type: boolean
1134711348
pgRepack:
@@ -11354,10 +11355,10 @@ spec:
1135411355
type: boolean
1135511356
type: object
1135611357
x-kubernetes-validations:
11357-
- message: to disable pg_tde first set enabled=false and wait for
11358-
pod restarts
11359-
rule: '!has(oldSelf.pg_tde.vault) || !oldSelf.pg_tde.enabled ||
11360-
has(self.pg_tde.vault)'
11358+
- message: to disable pg_tde first set enabled=false without removing
11359+
vault and wait for pod restarts
11360+
rule: '!has(oldSelf.pg_tde.vault) || !has(oldSelf.pg_tde.enabled)
11361+
|| !oldSelf.pg_tde.enabled || has(self.pg_tde.vault)'
1136111362
image:
1136211363
description: |-
1136311364
The image name to use for PostgreSQL containers. When omitted, the value

‎deploy/bundle.yaml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12019,7 +12019,8 @@ spec:
1201912019
type: object
1202012020
x-kubernetes-validations:
1202112021
- message: vault is required for enabling pg_tde
12022-
rule: '!self.enabled || has(self.vault)'
12022+
rule: '!has(self.enabled) || (has(self.enabled) && self.enabled
12023+
== false) || has(self.vault)'
1202312024
pgvector:
1202412025
properties:
1202512026
enabled:
@@ -12108,8 +12109,8 @@ spec:
1210812109
type: object
1210912110
type: object
1211012111
x-kubernetes-validations:
12111-
- message: to disable pg_tde first set enabled=false and wait for
12112-
pod restarts
12112+
- message: to disable pg_tde first set enabled=false without removing
12113+
vault and wait for pod restarts
1211312114
rule: '!has(oldSelf.pg_tde.vault) || !oldSelf.pg_tde.enabled ||
1211412115
has(self.pg_tde.vault)'
1211512116
image:
@@ -42461,7 +42462,8 @@ spec:
4246142462
type: object
4246242463
x-kubernetes-validations:
4246342464
- message: vault is required for enabling pg_tde
42464-
rule: '!self.enabled || has(self.vault)'
42465+
rule: '!has(self.enabled) || (has(self.enabled) && self.enabled
42466+
== false) || has(self.vault)'
4246542467
pgAudit:
4246642468
type: boolean
4246742469
pgRepack:
@@ -42474,10 +42476,10 @@ spec:
4247442476
type: boolean
4247542477
type: object
4247642478
x-kubernetes-validations:
42477-
- message: to disable pg_tde first set enabled=false and wait for
42478-
pod restarts
42479-
rule: '!has(oldSelf.pg_tde.vault) || !oldSelf.pg_tde.enabled ||
42480-
has(self.pg_tde.vault)'
42479+
- message: to disable pg_tde first set enabled=false without removing
42480+
vault and wait for pod restarts
42481+
rule: '!has(oldSelf.pg_tde.vault) || !has(oldSelf.pg_tde.enabled)
42482+
|| !oldSelf.pg_tde.enabled || has(self.pg_tde.vault)'
4248142483
image:
4248242484
description: |-
4248342485
The image name to use for PostgreSQL containers. When omitted, the value

‎deploy/crd.yaml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12019,7 +12019,8 @@ spec:
1201912019
type: object
1202012020
x-kubernetes-validations:
1202112021
- message: vault is required for enabling pg_tde
12022-
rule: '!self.enabled || has(self.vault)'
12022+
rule: '!has(self.enabled) || (has(self.enabled) && self.enabled
12023+
== false) || has(self.vault)'
1202312024
pgvector:
1202412025
properties:
1202512026
enabled:
@@ -12108,8 +12109,8 @@ spec:
1210812109
type: object
1210912110
type: object
1211012111
x-kubernetes-validations:
12111-
- message: to disable pg_tde first set enabled=false and wait for
12112-
pod restarts
12112+
- message: to disable pg_tde first set enabled=false without removing
12113+
vault and wait for pod restarts
1211312114
rule: '!has(oldSelf.pg_tde.vault) || !oldSelf.pg_tde.enabled ||
1211412115
has(self.pg_tde.vault)'
1211512116
image:
@@ -42461,7 +42462,8 @@ spec:
4246142462
type: object
4246242463
x-kubernetes-validations:
4246342464
- message: vault is required for enabling pg_tde
42464-
rule: '!self.enabled || has(self.vault)'
42465+
rule: '!has(self.enabled) || (has(self.enabled) && self.enabled
42466+
== false) || has(self.vault)'
4246542467
pgAudit:
4246642468
type: boolean
4246742469
pgRepack:
@@ -42474,10 +42476,10 @@ spec:
4247442476
type: boolean
4247542477
type: object
4247642478
x-kubernetes-validations:
42477-
- message: to disable pg_tde first set enabled=false and wait for
42478-
pod restarts
42479-
rule: '!has(oldSelf.pg_tde.vault) || !oldSelf.pg_tde.enabled ||
42480-
has(self.pg_tde.vault)'
42479+
- message: to disable pg_tde first set enabled=false without removing
42480+
vault and wait for pod restarts
42481+
rule: '!has(oldSelf.pg_tde.vault) || !has(oldSelf.pg_tde.enabled)
42482+
|| !oldSelf.pg_tde.enabled || has(self.pg_tde.vault)'
4248142483
image:
4248242484
description: |-
4248342485
The image name to use for PostgreSQL containers. When omitted, the value

‎deploy/cw-bundle.yaml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12019,7 +12019,8 @@ spec:
1201912019
type: object
1202012020
x-kubernetes-validations:
1202112021
- message: vault is required for enabling pg_tde
12022-
rule: '!self.enabled || has(self.vault)'
12022+
rule: '!has(self.enabled) || (has(self.enabled) && self.enabled
12023+
== false) || has(self.vault)'
1202312024
pgvector:
1202412025
properties:
1202512026
enabled:
@@ -12108,8 +12109,8 @@ spec:
1210812109
type: object
1210912110
type: object
1211012111
x-kubernetes-validations:
12111-
- message: to disable pg_tde first set enabled=false and wait for
12112-
pod restarts
12112+
- message: to disable pg_tde first set enabled=false without removing
12113+
vault and wait for pod restarts
1211312114
rule: '!has(oldSelf.pg_tde.vault) || !oldSelf.pg_tde.enabled ||
1211412115
has(self.pg_tde.vault)'
1211512116
image:
@@ -42461,7 +42462,8 @@ spec:
4246142462
type: object
4246242463
x-kubernetes-validations:
4246342464
- message: vault is required for enabling pg_tde
42464-
rule: '!self.enabled || has(self.vault)'
42465+
rule: '!has(self.enabled) || (has(self.enabled) && self.enabled
42466+
== false) || has(self.vault)'
4246542467
pgAudit:
4246642468
type: boolean
4246742469
pgRepack:
@@ -42474,10 +42476,10 @@ spec:
4247442476
type: boolean
4247542477
type: object
4247642478
x-kubernetes-validations:
42477-
- message: to disable pg_tde first set enabled=false and wait for
42478-
pod restarts
42479-
rule: '!has(oldSelf.pg_tde.vault) || !oldSelf.pg_tde.enabled ||
42480-
has(self.pg_tde.vault)'
42479+
- message: to disable pg_tde first set enabled=false without removing
42480+
vault and wait for pod restarts
42481+
rule: '!has(oldSelf.pg_tde.vault) || !has(oldSelf.pg_tde.enabled)
42482+
|| !oldSelf.pg_tde.enabled || has(self.pg_tde.vault)'
4248142483
image:
4248242484
description: |-
4248342485
The image name to use for PostgreSQL containers. When omitted, the value

‎pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,8 @@ func (cr *PerconaPGCluster) ToCrunchy(ctx context.Context, postgresCluster *crun
450450
postgresCluster.Spec.Extensions.PGVector = *cr.Spec.Extensions.BuiltIn.PGVector
451451
postgresCluster.Spec.Extensions.PGRepack = *cr.Spec.Extensions.BuiltIn.PGRepack
452452

453+
log.Info("PGTDE", "enabled", postgresCluster.Spec.Extensions.PGTDE.Enabled)
454+
453455
postgresCluster.Spec.TLSOnly = cr.Spec.TLSOnly
454456

455457
postgresCluster.Spec.InitContainer = cr.Spec.InitContainer

‎pkg/apis/postgres-operator.crunchydata.com/v1beta1/postgrescluster_types.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,14 +222,14 @@ type PGTDEVaultSpec struct {
222222
MountPath string `json:"mountPath,omitempty"`
223223
}
224224

225-
// +kubebuilder:validation:XValidation:rule="!self.enabled || has(self.vault)",message="vault is required for enabling pg_tde"
225+
// +kubebuilder:validation:XValidation:rule="!has(self.enabled) || (has(self.enabled) && self.enabled == false) || has(self.vault)",message="vault is required for enabling pg_tde"
226226
type PGTDESpec struct {
227227
Enabled bool `json:"enabled,omitempty"`
228228

229229
Vault *PGTDEVaultSpec `json:"vault,omitempty"`
230230
}
231231

232-
// +kubebuilder:validation:XValidation:rule="!has(oldSelf.pg_tde.vault) || !oldSelf.pg_tde.enabled || has(self.pg_tde.vault)",message="to disable pg_tde first set enabled=false without removing vault and wait for pod restarts"
232+
// +kubebuilder:validation:XValidation:rule="!has(oldSelf.pg_tde.vault) || !has(oldSelf.pg_tde.enabled) || !oldSelf.pg_tde.enabled || has(self.pg_tde.vault)",message="to disable pg_tde first set enabled=false without removing vault and wait for pod restarts"
233233
type ExtensionsSpec struct {
234234
PGStatMonitor bool `json:"pgStatMonitor,omitempty"`
235235
PGAudit bool `json:"pgAudit,omitempty"`

0 commit comments

Comments
 (0)