jcline/ansible
1
0
Fork 0
forked from infra/ansible
Code Pull requests Activity

bodhi-stg: add secret definition

Browse source 
Signed-off-by: Mattia Verga <mattia.verga@tiscali.it>
This commit is contained in:
Mattia Verga 2026-05-11 09:38:41 +02:00
commit ec82c78f22
3 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
playbooks/openshift-apps/bodhi.yml
View file

@ -78,6 +78,11 @@
object_template: pvc.yml.j2
object_objectname: pvc-valkey.yml
when: env == "staging"
- role: openshift/object
object_app: bodhi
object_template: secret.yml.j2
object_objectname: secret.yml
when: env == "staging"
- role: openshift/keytab
keytab_app: bodhi
keytab_key: koji-keytab

16
roles/openshift-apps/bodhi/templates/deployment.yml.j2
View file

@ -37,12 +37,12 @@ spec:
{% if env == "staging" %}
- name: wait-for-valkey
image: image-registry.openshift-image-registry.svc:5000/bodhi/bodhi-valkey:latest
command: ['/bin/sh', '-c', 'until valkey-cli -h bodhi-valkey -p 6379 -a "$BODHI_VALKEY_PASSWORD" ping; do echo "Waiting for Valkey..."; sleep 2; done']
command: ['/bin/sh', '-c', 'until valkey-cli -h bodhi-valkey -p 6379 -a "$VALKEY_PASSWORD" ping; do echo "Waiting for Valkey..."; sleep 2; done']
env:
- name: BODHI_VALKEY_PASSWORD
- name: VALKEY_PASSWORD
valueFrom:
secretKeyRef:
name: bodhi-valkey-secret
name: valkey-secret
key: password
{% endif %}
containers:
@ -389,12 +389,12 @@ spec:
- name: bodhi-valkey
image: image-registry.openshift-image-registry.svc:5000/bodhi/bodhi-valkey:latest
command: ["valkey-server"]
args: ["/etc/valkey/valkey.conf", "--requirepass", "$(BODHI_VALKEY_PASSWORD)"]
args: ["/etc/valkey/valkey.conf", "--requirepass", "$(VALKEY_PASSWORD)"]
env:
- name: BODHI_VALKEY_PASSWORD
- name: VALKEY_PASSWORD
valueFrom:
secretKeyRef:
name: bodhi-valkey-secret
name: valkey-secret
key: password
resources: {}
volumeMounts:
@ -408,14 +408,14 @@ spec:
initialDelaySeconds: 5
periodSeconds: 60
exec:
command: ['/bin/sh', '-c', 'valkey-cli -a "$BODHI_VALKEY_PASSWORD" ping']
command: ['/bin/sh', '-c', 'valkey-cli -a "$VALKEY_PASSWORD" ping']
livenessProbe:
timeoutSeconds: 60
initialDelaySeconds: 30
periodSeconds: 120
failureThreshold: 5
exec:
command: ['/bin/sh', '-c', 'valkey-cli -a "$BODHI_VALKEY_PASSWORD" ping']
command: ['/bin/sh', '-c', 'valkey-cli -a "$VALKEY_PASSWORD" ping']
volumes:
- name: bodhi-valkey-data-volume
persistentVolumeClaim:

7
roles/openshift-apps/bodhi/templates/secret.yml.j2 Normal file
View file

@ -0,0 +1,7 @@
---
kind: Secret
apiVersion: v1
metadata:
name: valkey-secret
stringData:
password: {{ bodhi_valkey_secret }}