Skip to content

Use redis/postgres images from quay registry #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rooftopcellist merged 3 commits into from
Apr 19, 2023
Merged

Use redis/postgres images from quay registry #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ebe3a0
Use redis/postgres images from quay registry
dsavineau Apr 3, 2023
9989e1b
Merge branch 'main' into images_from_quay
rooftopcellist Apr 10, 2023
a0aee54
Merge branch 'main' into images_from_quay
rooftopcellist Apr 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions roles/postgres/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ deployment_type: eda
database_name: "{{ deployment_type }}"
database_username: "{{ deployment_type }}"

_postgres_image: postgres
_postgres_image_version: 13
_postgres_image: quay.io/sclorg/postgresql-13-c8s
_postgres_image_version: latest

# Add a nodeSelector for the Postgres pods.
# It must match a node's labels for the pod to be scheduled on that node.
Expand Down
24 changes: 0 additions & 24 deletions roles/postgres/templates/postgres.statefulset.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ spec:
args: {{ combined_database.postgres_extra_args }}
{% endif %}
env:
# For postgres_image based on rhel8/postgresql-13
- name: POSTGRESQL_DATABASE
valueFrom:
secretKeyRef:
Expand All @@ -75,29 +74,6 @@ spec:
secretKeyRef:
name: '{{ __database_secret }}'
key: password

# For postgres_image based on postgres
- name: POSTGRES_DB
valueFrom:
secretKeyRef:
name: '{{ __database_secret }}'
key: database
- name: POSTGRES_USER
valueFrom:
secretKeyRef:
name: '{{ __database_secret }}'
key: username
- name: POSTGRES_PASSWORD
valueFrom:
secretKeyRef:
name: '{{ __database_secret }}'
key: password
- name: PGDATA
value: '{{ combined_database.postgres_data_path }}'
- name: POSTGRES_INITDB_ARGS
value: '{{ postgres_initdb_args }}'
- name: POSTGRES_HOST_AUTH_METHOD
value: '{{ postgres_host_auth_method }}'
ports:
- containerPort: {{ eda_postgres_port | default('5432')}}
name: postgres-{{ supported_pg_version }}
Expand Down
2 changes: 0 additions & 2 deletions roles/postgres/vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
---
# vars file for PostgreSQL database

postgres_initdb_args: '--auth-host=scram-sha-256'
postgres_host_auth_method: 'scram-sha-256'
supported_pg_version: 13
4 changes: 2 additions & 2 deletions roles/redis/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ deployment_type: eda
image_pull_policy: IfNotPresent
image_pull_secrets: []

_redis_image: redis
_redis_image_version: 7
_redis_image: quay.io/sclorg/redis-6-c8s
_redis_image_version: latest

redis: {}
_redis:
Expand Down