From 1f87100c85c2a929391fd7c502366bfe08ee2499 Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Thu, 20 May 2021 18:48:58 +0200 Subject: [PATCH] add exmaples to manifests --- e2e/tests/test_e2e.py | 5 +++-- manifests/configmap.yaml | 3 ++- manifests/postgresql-operator-default-configuration.yaml | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py index 01f4992a3..824673c79 100644 --- a/e2e/tests/test_e2e.py +++ b/e2e/tests/test_e2e.py @@ -198,6 +198,7 @@ class EndToEndTestCase(unittest.TestCase): "data": { "enable_postgres_team_crd": "true", "enable_team_member_deprecation": "true", + "role_deletion_suffix": "_delete_me", "resync_period": "15s", }, } @@ -250,7 +251,7 @@ class EndToEndTestCase(unittest.TestCase): SELECT rolname FROM pg_catalog.pg_roles WHERE (rolname = 'tester' AND rolcanlogin) - OR (rolname = 'kind_deleted' AND NOT rolcanlogin); + OR (rolname = 'kind_delete_me' AND NOT rolcanlogin); """ self.eventuallyEqual(lambda: len(self.query_database(leader.metadata.name, "postgres", user_query)), 2, "Database role of replaced member in PostgresTeam not renamed", 10, 5) @@ -273,7 +274,7 @@ class EndToEndTestCase(unittest.TestCase): SELECT rolname FROM pg_catalog.pg_roles WHERE (rolname = 'kind' AND rolcanlogin) - OR (rolname = 'tester_deleted' AND NOT rolcanlogin); + OR (rolname = 'tester_delete_me' AND NOT rolcanlogin); """ self.eventuallyEqual(lambda: len(self.query_database(leader.metadata.name, "postgres", user_query)), 2, "Database role of recreated member in PostgresTeam not renamed back to original name", 10, 5) diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml index fea8b19cc..b379975eb 100644 --- a/manifests/configmap.yaml +++ b/manifests/configmap.yaml @@ -51,6 +51,7 @@ data: # enable_shm_volume: "true" # enable_sidecars: "true" enable_spilo_wal_path_compat: "true" + enable_team_member_deprecation: "false" # enable_team_superuser: "false" enable_teams_api: "false" # etcd_host: "" @@ -111,7 +112,7 @@ data: resource_check_timeout: 10m resync_period: 30m ring_log_lines: "100" - # role_deletion_suffix: "_deleted" + role_deletion_suffix: "_deleted" secret_name_template: "{username}.{cluster}.credentials" # sidecar_docker_images: "" # set_memory_request_to_limit: "false" diff --git a/manifests/postgresql-operator-default-configuration.yaml b/manifests/postgresql-operator-default-configuration.yaml index c05843f7a..65dfd6ce4 100644 --- a/manifests/postgresql-operator-default-configuration.yaml +++ b/manifests/postgresql-operator-default-configuration.yaml @@ -141,6 +141,7 @@ configuration: # enable_admin_role_for_users: true # enable_postgres_team_crd: false # enable_postgres_team_crd_superusers: false + enable_team_member_deprecation: false enable_team_superuser: false enable_teams_api: false # pam_configuration: "" @@ -149,7 +150,7 @@ configuration: # - postgres_superusers protected_role_names: - admin - # role_deletion_suffix: "_deleted" + role_deletion_suffix: "_deleted" team_admin_role: admin team_api_role_configuration: log_statement: all