Move to rhel8 PG10 container for persistent PG

Merge in updated liveness checks from upstream template
This commit is contained in:
Bill Nottingham 2020-10-21 17:29:57 -04:00
parent 81a79c30cb
commit f1d2d79f00
4 changed files with 11 additions and 13 deletions

View File

@ -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 }}' \

View File

@ -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

View File

@ -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 }} \

View File

@ -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: