Downstream k8s installer changes

installer/roles/kubernetes/tasks/backup.yml

@@ -50,7 +50,7 @@
   shell: |
     {{ kubectl_or_oc }} -n {{ kubernetes_namespace }} exec ansible-tower-management -- \
       bash -c "PGPASSWORD={{ pg_password | quote }} \
-        pg_dump --clean --create \
+        scl enable rh-postgresql10 -- pg_dump --clean --create \
           --host='{{ pg_hostname | default('postgresql') }}' \
           --port={{ pg_port | default('5432') }} \
           --username='{{ pg_username }}' \

installer/roles/kubernetes/tasks/main.yml

@@ -113,6 +113,59 @@
     seconds: "{{ postgress_activate_wait }}"
   when: openshift_pg_activate.changed or kubernetes_pg_activate.changed
 
+- name: Check if Postgres 9.6 is being used
+  shell: |
+    POD=$({{ kubectl_or_oc }} -n {{ kubernetes_namespace }} \
+      get pods -l=name=postgresql --field-selector status.phase=Running -o jsonpath="{.items[0].metadata.name}")
+    oc exec -ti $POD -n {{ kubernetes_namespace }} -- bash -c "psql -tAc 'select version()'"
+  register: pg_version
+
+- name: Upgrade Postgres if necessary
+  block:
+    - name: Set new pg image
+      shell: |
+        IMAGE=registry.access.redhat.com/rhscl/postgresql-10-rhel7
+        {{ kubectl_or_oc }} -n {{ kubernetes_namespace }} set image dc/postgresql postgresql=$IMAGE
+
+    - name: Wait for change to take affect
+      pause:
+        seconds: 5
+
+    - name: Set env var for pg upgrade
+      shell: |
+        {{ kubectl_or_oc }} -n {{ kubernetes_namespace }} set env dc/postgresql POSTGRESQL_UPGRADE=copy
+
+    - name: Wait for change to take affect
+      pause:
+        seconds: 5
+
+    - name: Set env var for new pg version
+      shell: |
+        {{ kubectl_or_oc }} -n {{ kubernetes_namespace }} set env dc/postgresql POSTGRESQL_VERSION=10
+
+    - name: Wait for Postgres to redeploy
+      pause:
+        seconds: "{{ postgress_activate_wait }}"
+
+    - name: Wait for Postgres to finish upgrading
+      shell: |
+        POD=$({{ kubectl_or_oc }} -n {{ kubernetes_namespace }} \
+          get pods -l=name=postgresql -o jsonpath="{.items[0].metadata.name}")
+        {{ kubectl_or_oc }} -n {{ kubernetes_namespace }} logs $POD | grep 'Upgrade DONE'
+      register: pg_upgrade_logs
+      retries: 360
+      delay: 10
+      until: pg_upgrade_logs is success
+
+    - name: Unset upgrade env var
+      shell: |
+        {{ kubectl_or_oc }} -n {{ kubernetes_namespace }} set env dc/postgresql POSTGRESQL_UPGRADE-
+
+    - name: Wait for Postgres to redeploy
+      pause:
+        seconds: "{{ postgress_activate_wait }}"
+  when: "pg_version is success and '9.6' in pg_version.stdout"
+
 - name: Set image names if using custom registry
   block:
     - name: Set task image name
@@ -126,6 +179,10 @@
       when: kubernetes_web_image is not defined
   when: docker_registry is defined
 
+- name: Generate SSL certificates for RabbitMQ, if needed
+  include_tasks: ssl_cert_gen.yml
+  when: "rabbitmq_use_ssl|default(False)|bool"
+
 - name: Render deployment templates
   set_fact:
     "{{ item }}": "{{ lookup('template', item + '.yml.j2') }}"

installer/roles/kubernetes/tasks/restore.yml

@@ -21,7 +21,7 @@
 
 - name: Unarchive Tower backup
   unarchive:
-    src: tower-openshift-backup-latest.tar.gz
+    src: "{{ restore_backup_file }}"
     dest: "{{ playbook_dir }}/tower-openshift-restore"
     extra_opts: [--strip-components=1]
 
@@ -76,7 +76,7 @@
   shell: |
     {{ kubectl_or_oc }} -n {{ kubernetes_namespace }} \
       exec -i ansible-tower-management -- bash -c "PGPASSWORD={{ pg_password | quote }} \
-        psql \
+        scl enable rh-postgresql10 -- psql \
         --host={{ pg_hostname | default('postgresql') }} \
         --port={{ pg_port | default('5432') }} \
         --username=postgres \
@@ -88,7 +88,7 @@
   shell: |
     {{ kubectl_or_oc }} -n {{ kubernetes_namespace }} \
       exec -i ansible-tower-management -- bash -c "PGPASSWORD={{ pg_password | quote }} \
-        psql \
+        scl enable rh-postgresql10 -- psql \
         --host={{ pg_hostname | default('postgresql') }} \
         --port={{ pg_port | default('5432') }} \
         --username={{ pg_username }} \
@@ -99,7 +99,7 @@
   shell: |
     {{ kubectl_or_oc }} -n {{ kubernetes_namespace }} \
       exec -i ansible-tower-management -- bash -c "PGPASSWORD={{ pg_password | quote }} \
-        psql \
+        scl enable rh-postgresql10 -- psql \
         --host={{ pg_hostname | default('postgresql') }} \
         --port={{ pg_port | default('5432') }} \
         --username=postgres \