diff --git a/chart/scripts/update_ownership.sql b/chart/scripts/update_ownership.sql index 1d2b4df..392b899 100644 --- a/chart/scripts/update_ownership.sql +++ b/chart/scripts/update_ownership.sql @@ -10,12 +10,12 @@ BEGIN WHERE schemaname = 'public' LIMIT 1; - -- Si le propriétaire actuel est différent de erp_role - IF current_schema_owner <> 'erp_role' THEN + -- Si le propriétaire actuel est différent de {{ .Values.db.ownerRole }} + IF current_schema_owner <> '{{ .Values.db.ownerRole }}' THEN -- Construire et exécuter la requête REASSIGN OWNED BY - EXECUTE format('REASSIGN OWNED BY %I TO %I', current_schema_owner, 'erp_role'); - RAISE NOTICE 'Ownership of all objects in schema "public" has been reassigned from % to %', current_schema_owner, 'erp_role'; + EXECUTE format('REASSIGN OWNED BY %I TO %I', current_schema_owner, '{{ .Values.db.ownerRole }}'); + RAISE NOTICE 'Ownership of all objects in schema "public" has been reassigned from % to %', current_schema_owner, '{{ .Values.db.ownerRole }}'; ELSE - RAISE NOTICE 'No change needed; the owner of schema "public" is already %', 'erp_role'; + RAISE NOTICE 'No change needed; the owner of schema "public" is already %', '{{ .Values.db.ownerRole }}'; END IF; END $$; diff --git a/chart/templates/scripts-config.yaml b/chart/templates/scripts-config.yaml index a02bb11..0eaaeb6 100644 --- a/chart/templates/scripts-config.yaml +++ b/chart/templates/scripts-config.yaml @@ -7,4 +7,4 @@ data: {{- .Files.Get "scripts/update_conf_db_credentials.sh" | nindent 4 }} update_table_ownership.sql: | - {{- .Files.Get "scripts/update_ownership.sql" | nindent 4 }} + {{- tpl (.Files.Get "scripts/update_ownership.sql") . | nindent 4 }} diff --git a/chart/values-sandbox.yaml b/chart/values-sandbox.yaml index ce25ddf..8e1647f 100644 --- a/chart/values-sandbox.yaml +++ b/chart/values-sandbox.yaml @@ -16,6 +16,7 @@ host: erp-sandbox.arcodange.lab db: name: erp-sandbox + ownerRole: erp_sandbox_role vault: k8sRole: erp-sandbox diff --git a/chart/values.yaml b/chart/values.yaml index 25929d3..7259ff0 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -16,6 +16,7 @@ host: erp.arcodange.lab # internal hostname for this instance db: name: erp # PostgreSQL database name (matches factory tfvars) + ownerRole: erp_role # Postgres owner role; snake-case _role for prod / __role for non-prod (matches factory/postgres/iac) vault: k8sRole: erp # VaultAuth role (postgres/iac issues this per instance)