Skip to content

Commit 1172a77

Browse files
egeguneshors
egegunes
and
hors
authored
K8SPG-911: Revert pg_tde support (#1504)
* Revert "K8SPG-911: Add pg_tde support (#1440)" This reverts commit 8675ac6. * fix unit tests --------- Co-authored-by: Viacheslav Sarzhan <slava.sarzhan@percona.com>
1 parent ecd550e commit 1172a77

51 files changed

Lines changed: 58 additions & 2739 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -13594,53 +13594,6 @@ spec:
1359413594
type: boolean
1359513595
extensions:
1359613596
properties:
13597-
pg_tde:
13598-
properties:
13599-
enabled:
13600-
type: boolean
13601-
vault:
13602-
properties:
13603-
caSecret:
13604-
description: Name of the secret that contains the CA certificate
13605-
for SSL verification.
13606-
properties:
13607-
key:
13608-
type: string
13609-
name:
13610-
type: string
13611-
required:
13612-
- key
13613-
- name
13614-
type: object
13615-
host:
13616-
description: Host of Vault server.
13617-
type: string
13618-
mountPath:
13619-
default: secret/data
13620-
description: The mount point on the Vault server where
13621-
the key provider should store the keys.
13622-
type: string
13623-
tokenSecret:
13624-
description: Name of the secret that contains the access
13625-
token with read and write access to the mount path.
13626-
properties:
13627-
key:
13628-
type: string
13629-
name:
13630-
type: string
13631-
required:
13632-
- key
13633-
- name
13634-
type: object
13635-
required:
13636-
- host
13637-
- tokenSecret
13638-
type: object
13639-
type: object
13640-
x-kubernetes-validations:
13641-
- message: vault is required for enabling pg_tde
13642-
rule: '!has(self.enabled) || (has(self.enabled) && self.enabled
13643-
== false) || has(self.vault)'
1364413597
pgAudit:
1364513598
type: boolean
1364613599
pgRepack:
@@ -13652,11 +13605,6 @@ spec:
1365213605
pgvector:
1365313606
type: boolean
1365413607
type: object
13655-
x-kubernetes-validations:
13656-
- message: to disable pg_tde first set enabled=false without removing
13657-
vault and wait for pod restarts
13658-
rule: '!has(oldSelf.pg_tde) || !has(oldSelf.pg_tde.vault) || !has(oldSelf.pg_tde.enabled)
13659-
|| !oldSelf.pg_tde.enabled || has(self.pg_tde.vault)'
1366013608
image:
1366113609
description: |-
1366213610
The image name to use for PostgreSQL containers. When omitted, the value
@@ -31023,10 +30971,6 @@ spec:
3102330971
description: The PostgreSQL system identifier reported by Patroni.
3102430972
type: string
3102530973
type: object
31026-
pgTDERevision:
31027-
description: Identifies the pg_tde configuration that have been installed
31028-
into PostgreSQL.
31029-
type: string
3103030974
pgbackrest:
3103130975
description: Status information for pgBackRest
3103230976
properties:

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

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -13693,8 +13693,6 @@ spec:
1369313693
description: The specification of extensions.
1369413694
properties:
1369513695
builtin:
13696-
description: 'Deprecated: Use extensions.<extension> instead.
13697-
This field will be removed after 2.11.0.'
1369813696
properties:
1369913697
pg_audit:
1370013698
type: boolean
@@ -13724,78 +13722,6 @@ spec:
1372413722
description: PullPolicy describes a policy for if/when to pull
1372513723
a container image
1372613724
type: string
13727-
pg_audit:
13728-
properties:
13729-
enabled:
13730-
type: boolean
13731-
type: object
13732-
pg_repack:
13733-
properties:
13734-
enabled:
13735-
type: boolean
13736-
type: object
13737-
pg_stat_monitor:
13738-
properties:
13739-
enabled:
13740-
type: boolean
13741-
type: object
13742-
pg_stat_statements:
13743-
properties:
13744-
enabled:
13745-
type: boolean
13746-
type: object
13747-
pg_tde:
13748-
properties:
13749-
enabled:
13750-
type: boolean
13751-
vault:
13752-
properties:
13753-
caSecret:
13754-
description: Name of the secret that contains the CA certificate
13755-
for SSL verification.
13756-
properties:
13757-
key:
13758-
type: string
13759-
name:
13760-
type: string
13761-
required:
13762-
- key
13763-
- name
13764-
type: object
13765-
host:
13766-
description: Host of Vault server.
13767-
type: string
13768-
mountPath:
13769-
default: secret/data
13770-
description: The mount point on the Vault server where
13771-
the key provider should store the keys.
13772-
type: string
13773-
tokenSecret:
13774-
description: Name of the secret that contains the access
13775-
token with read and write access to the mount path.
13776-
properties:
13777-
key:
13778-
type: string
13779-
name:
13780-
type: string
13781-
required:
13782-
- key
13783-
- name
13784-
type: object
13785-
required:
13786-
- host
13787-
- tokenSecret
13788-
type: object
13789-
type: object
13790-
x-kubernetes-validations:
13791-
- message: vault is required for enabling pg_tde
13792-
rule: '!has(self.enabled) || (has(self.enabled) && self.enabled
13793-
== false) || has(self.vault)'
13794-
pgvector:
13795-
properties:
13796-
enabled:
13797-
type: boolean
13798-
type: object
1379913725
storage:
1380013726
properties:
1380113727
bucket:
@@ -13878,11 +13804,6 @@ spec:
1387813804
type: string
1387913805
type: object
1388013806
type: object
13881-
x-kubernetes-validations:
13882-
- message: to disable pg_tde first set enabled=false without removing
13883-
vault and wait for pod restarts
13884-
rule: '!has(oldSelf.pg_tde) || !has(oldSelf.pg_tde.vault) || !has(oldSelf.pg_tde.enabled)
13885-
|| !oldSelf.pg_tde.enabled || has(self.pg_tde.vault)'
1388613807
image:
1388713808
description: The image name to use for PostgreSQL containers.
1388813809
type: string

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

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -14332,8 +14332,6 @@ spec:
1433214332
description: The specification of extensions.
1433314333
properties:
1433414334
builtin:
14335-
description: 'Deprecated: Use extensions.<extension> instead.
14336-
This field will be removed after 2.11.0.'
1433714335
properties:
1433814336
pg_audit:
1433914337
type: boolean
@@ -14363,78 +14361,6 @@ spec:
1436314361
description: PullPolicy describes a policy for if/when to pull
1436414362
a container image
1436514363
type: string
14366-
pg_audit:
14367-
properties:
14368-
enabled:
14369-
type: boolean
14370-
type: object
14371-
pg_repack:
14372-
properties:
14373-
enabled:
14374-
type: boolean
14375-
type: object
14376-
pg_stat_monitor:
14377-
properties:
14378-
enabled:
14379-
type: boolean
14380-
type: object
14381-
pg_stat_statements:
14382-
properties:
14383-
enabled:
14384-
type: boolean
14385-
type: object
14386-
pg_tde:
14387-
properties:
14388-
enabled:
14389-
type: boolean
14390-
vault:
14391-
properties:
14392-
caSecret:
14393-
description: Name of the secret that contains the CA certificate
14394-
for SSL verification.
14395-
properties:
14396-
key:
14397-
type: string
14398-
name:
14399-
type: string
14400-
required:
14401-
- key
14402-
- name
14403-
type: object
14404-
host:
14405-
description: Host of Vault server.
14406-
type: string
14407-
mountPath:
14408-
default: secret/data
14409-
description: The mount point on the Vault server where
14410-
the key provider should store the keys.
14411-
type: string
14412-
tokenSecret:
14413-
description: Name of the secret that contains the access
14414-
token with read and write access to the mount path.
14415-
properties:
14416-
key:
14417-
type: string
14418-
name:
14419-
type: string
14420-
required:
14421-
- key
14422-
- name
14423-
type: object
14424-
required:
14425-
- host
14426-
- tokenSecret
14427-
type: object
14428-
type: object
14429-
x-kubernetes-validations:
14430-
- message: vault is required for enabling pg_tde
14431-
rule: '!has(self.enabled) || (has(self.enabled) && self.enabled
14432-
== false) || has(self.vault)'
14433-
pgvector:
14434-
properties:
14435-
enabled:
14436-
type: boolean
14437-
type: object
1443814364
storage:
1443914365
properties:
1444014366
bucket:
@@ -14517,11 +14443,6 @@ spec:
1451714443
type: string
1451814444
type: object
1451914445
type: object
14520-
x-kubernetes-validations:
14521-
- message: to disable pg_tde first set enabled=false without removing
14522-
vault and wait for pod restarts
14523-
rule: '!has(oldSelf.pg_tde) || !has(oldSelf.pg_tde.vault) || !has(oldSelf.pg_tde.enabled)
14524-
|| !oldSelf.pg_tde.enabled || has(self.pg_tde.vault)'
1452514446
image:
1452614447
description: The image name to use for PostgreSQL containers.
1452714448
type: string

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

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -13554,53 +13554,6 @@ spec:
1355413554
type: boolean
1355513555
extensions:
1355613556
properties:
13557-
pg_tde:
13558-
properties:
13559-
enabled:
13560-
type: boolean
13561-
vault:
13562-
properties:
13563-
caSecret:
13564-
description: Name of the secret that contains the CA certificate
13565-
for SSL verification.
13566-
properties:
13567-
key:
13568-
type: string
13569-
name:
13570-
type: string
13571-
required:
13572-
- key
13573-
- name
13574-
type: object
13575-
host:
13576-
description: Host of Vault server.
13577-
type: string
13578-
mountPath:
13579-
default: secret/data
13580-
description: The mount point on the Vault server where
13581-
the key provider should store the keys.
13582-
type: string
13583-
tokenSecret:
13584-
description: Name of the secret that contains the access
13585-
token with read and write access to the mount path.
13586-
properties:
13587-
key:
13588-
type: string
13589-
name:
13590-
type: string
13591-
required:
13592-
- key
13593-
- name
13594-
type: object
13595-
required:
13596-
- host
13597-
- tokenSecret
13598-
type: object
13599-
type: object
13600-
x-kubernetes-validations:
13601-
- message: vault is required for enabling pg_tde
13602-
rule: '!has(self.enabled) || (has(self.enabled) && self.enabled
13603-
== false) || has(self.vault)'
1360413557
pgAudit:
1360513558
type: boolean
1360613559
pgRepack:
@@ -13612,11 +13565,6 @@ spec:
1361213565
pgvector:
1361313566
type: boolean
1361413567
type: object
13615-
x-kubernetes-validations:
13616-
- message: to disable pg_tde first set enabled=false without removing
13617-
vault and wait for pod restarts
13618-
rule: '!has(oldSelf.pg_tde) || !has(oldSelf.pg_tde.vault) || !has(oldSelf.pg_tde.enabled)
13619-
|| !oldSelf.pg_tde.enabled || has(self.pg_tde.vault)'
1362013568
image:
1362113569
description: |-
1362213570
The image name to use for PostgreSQL containers. When omitted, the value
@@ -30921,10 +30869,6 @@ spec:
3092130869
description: The PostgreSQL system identifier reported by Patroni.
3092230870
type: string
3092330871
type: object
30924-
pgTDERevision:
30925-
description: Identifies the pg_tde configuration that have been installed
30926-
into PostgreSQL.
30927-
type: string
3092830872
pgbackrest:
3092930873
description: Status information for pgBackRest
3093030874
properties:

0 commit comments

Comments
 (0)