diff --git a/installer/roles/kubernetes/tasks/backup.yml b/installer/roles/kubernetes/tasks/backup.yml index ebd53aadb1..d2d41bbbc1 100644 --- a/installer/roles/kubernetes/tasks/backup.yml +++ b/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 }} \ - scl enable rh-postgresql10 -- pg_dump --clean --create \ + pg_dump --clean --create \ --host='{{ pg_hostname | default('postgresql') }}' \ --port={{ pg_port | default('5432') }} \ --username='{{ pg_username }}' \ diff --git a/installer/roles/kubernetes/tasks/main.yml b/installer/roles/kubernetes/tasks/main.yml index 6585b5804f..fb5a708e67 100644 --- a/installer/roles/kubernetes/tasks/main.yml +++ b/installer/roles/kubernetes/tasks/main.yml @@ -145,7 +145,7 @@ block: - name: Set new pg image shell: | - IMAGE=registry.access.redhat.com/rhscl/postgresql-10-rhel7 + IMAGE=registry.redhat.io/rhel-8/postgresql-10 {{ kubectl_or_oc }} -n {{ kubernetes_namespace }} set image dc/postgresql postgresql=$IMAGE - name: Wait for change to take affect diff --git a/installer/roles/kubernetes/tasks/restore.yml b/installer/roles/kubernetes/tasks/restore.yml index 8d6a6a3c3d..9d0358e751 100644 --- a/installer/roles/kubernetes/tasks/restore.yml +++ b/installer/roles/kubernetes/tasks/restore.yml @@ -95,7 +95,7 @@ shell: | {{ kubectl_or_oc }} -n {{ kubernetes_namespace }} \ exec -i ansible-tower-management -- bash -c "PGPASSWORD={{ pg_password | quote }} \ - scl enable rh-postgresql10 -- psql \ + psql \ --host={{ pg_hostname | default('postgresql') }} \ --port={{ pg_port | default('5432') }} \ --username={{ pg_username }} \ diff --git a/installer/roles/kubernetes/templates/postgresql-persistent.yml.j2 b/installer/roles/kubernetes/templates/postgresql-persistent.yml.j2 index 8db579a0c3..febbc3402a 100644 --- a/installer/roles/kubernetes/templates/postgresql-persistent.yml.j2 +++ b/installer/roles/kubernetes/templates/postgresql-persistent.yml.j2 @@ -99,13 +99,15 @@ objects: name: ${DATABASE_SERVICE_NAME} - name: POSTGRESQL_MAX_CONNECTIONS value: ${POSTGRESQL_MAX_CONNECTIONS} - image: registry.access.redhat.com/rhscl/postgresql-10-rhel7 + image: registry.redhat.io/rhel8/postgresql-10 imagePullPolicy: IfNotPresent livenessProbe: - initialDelaySeconds: 30 - tcpSocket: - port: 5432 - timeoutSeconds: 1 + exec: + command: + - /usr/libexec/check-container + - --live + initialDelaySeconds: 120 + timeoutSeconds: 10 name: postgresql ports: - containerPort: 5432 @@ -113,11 +115,7 @@ objects: readinessProbe: exec: command: - - /bin/sh - - -i - - -c - - psql -h 127.0.0.1 -U $POSTGRESQL_USER -q -d template1 - -c 'SELECT 1' + - /usr/libexec/check-container initialDelaySeconds: 5 timeoutSeconds: 1 resources: