internet/awx-operator
3
0
Fork 0
mirror of https://github.com/ansible/awx-operator.git synced 2026-03-26 21:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing postgres upgrade conditional (#1741)

Browse Source
This commit is contained in:
aknochow
2024-03-01 17:09:15 -05:00
committed by GitHub
parent 16b2f2a34f
commit d0827ba426
4 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
molecule/default/tasks/awx_replicas_test.yml
View File

@@ -61,4 +61,4 @@
expected_web_replicas: 3 expected_web_replicas: 3
expected_task_replicas: 3 expected_task_replicas: 3
tags: tags:
- replicas - replicas

34
roles/installer/tasks/database_configuration.yml
View File

@@ -117,26 +117,26 @@
register: _running_pods register: _running_pods
- block: - block:
- name: Filter pods by name - name: Filter pods by name
set_fact: set_fact:
filtered_old_postgres_pods: "{{ _running_pods.resources | filtered_old_postgres_pods: "{{ _running_pods.resources |
selectattr('metadata.name', 'match', ansible_operator_meta.name + '-postgres.*-0') | selectattr('metadata.name', 'match', ansible_operator_meta.name + '-postgres.*-0') |
rejectattr('metadata.name', 'search', '-' + supported_pg_version | string + '-0') | rejectattr('metadata.name', 'search', '-' + supported_pg_version | string + '-0') |
list }}" list }}"
# Sort pods by name in reverse order (most recent PG version first) and set # Sort pods by name in reverse order (most recent PG version first) and set
- name: Set info for previous postgres pod - name: Set info for previous postgres pod
set_fact: set_fact:
sorted_old_postgres_pods: "{{ filtered_old_postgres_pods | sorted_old_postgres_pods: "{{ filtered_old_postgres_pods |
sort(attribute='metadata.name') | sort(attribute='metadata.name') |
reverse }}" reverse }}"
when: filtered_old_postgres_pods | length when: filtered_old_postgres_pods | length
- name: Set info for previous postgres pod - name: Set info for previous postgres pod
set_fact: set_fact:
old_postgres_pod: "{{ sorted_old_postgres_pods | first }}" old_postgres_pod: "{{ sorted_old_postgres_pods | first }}"
when: filtered_old_postgres_pods | length when: filtered_old_postgres_pods | length
when: _running_pods.resources | length when: _running_pods.resources | length
- name: Look up details for this deployment - name: Look up details for this deployment
@@ -179,7 +179,7 @@
- (_old_pg_version.stdout | default(0) | int ) < supported_pg_version - (_old_pg_version.stdout | default(0) | int ) < supported_pg_version
when: when:
- managed_database - managed_database
- (_previous_upgraded_pg_version | default(false)) | ternary(_previous_upgraded_pg_version < supported_pg_version, true) - (_previous_upgraded_pg_version | default(false)) | ternary(_previous_upgraded_pg_version | int < supported_pg_version, true)
- old_postgres_pod | length # If empty, then old pg pod has been removed and we can assume the upgrade is complete - old_postgres_pod | length # If empty, then old pg pod has been removed and we can assume the upgrade is complete
- block: - block:

2
roles/installer/tasks/update_status.yml
View File

@@ -111,5 +111,5 @@
name: "{{ ansible_operator_meta.name }}" name: "{{ ansible_operator_meta.name }}"
namespace: "{{ ansible_operator_meta.namespace }}" namespace: "{{ ansible_operator_meta.namespace }}"
status: status:
upgradedPostgresVersion: "{{ upgraded_postgres_version | string }}" upgradedPostgresVersion: "{{ upgraded_postgres_version }}"
when: upgraded_postgres_version is defined when: upgraded_postgres_version is defined

1
roles/installer/tasks/upgrade_postgres.yml
View File

@@ -164,4 +164,5 @@
loop: loop:
- "postgres-{{ ansible_operator_meta.name }}-postgres-0" - "postgres-{{ ansible_operator_meta.name }}-postgres-0"
- "postgres-{{ ansible_operator_meta.name }}-postgres-13-0" - "postgres-{{ ansible_operator_meta.name }}-postgres-13-0"
- "postgres-13-{{ ansible_operator_meta.name }}-postgres-13-0"
when: postgres_keep_pvc_after_upgrade when: postgres_keep_pvc_after_upgrade