From a9245454a41b64582606a54756cdbc821a2683d5 Mon Sep 17 00:00:00 2001 From: Imed Date: Mon, 27 Nov 2023 17:26:24 +0100 Subject: [PATCH] Remove reference to cluster.local (#1566) Co-authored-by: Imed Aouidene --- docs/migration/migration.md | 2 +- roles/backup/tasks/postgres.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/migration/migration.md b/docs/migration/migration.md index f0d5f7c83..bdf9a8cd9 100644 --- a/docs/migration/migration.md +++ b/docs/migration/migration.md @@ -41,7 +41,7 @@ stringData: type: Opaque ``` -> For `host`, a URL resolvable by the cluster could look something like `postgresql..svc.cluster.local`, where `` is filled in with the namespace of the AWX deployment you are migrating data from. +> For `host`, a URL resolvable by the cluster could look something like `postgresql..svc.`, where `` is filled in with the namespace of the AWX deployment you are migrating data from, and `` is filled in with the internal kubernretes cluster domain (In most cases it's `cluster.local`). If your AWX deployment is already using an external database server or its database is otherwise not managed by the AWX deployment, you can instead create the same secret as above but omit the `-old-` from the `name`. diff --git a/roles/backup/tasks/postgres.yml b/roles/backup/tasks/postgres.yml index 4f12db146..bb1812a01 100644 --- a/roles/backup/tasks/postgres.yml +++ b/roles/backup/tasks/postgres.yml @@ -79,7 +79,7 @@ - name: Set full resolvable host name for postgres pod set_fact: - resolvable_db_host: '{{ (awx_postgres_type == "managed") | ternary(awx_postgres_host + "." + ansible_operator_meta.namespace + ".svc.cluster.local", awx_postgres_host) }}' # yamllint disable-line rule:line-length + resolvable_db_host: '{{ (awx_postgres_type == "managed") | ternary(awx_postgres_host + "." + ansible_operator_meta.namespace + ".svc", awx_postgres_host) }}' # yamllint disable-line rule:line-length no_log: "{{ no_log }}" - name: Get the current resource task pod information.