Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Revert "Apparently we don't need to repeat volume definitions across deploymentconfigs"

Browse source 
Well, yes we do :-(

This reverts commit 2571561222.
This commit is contained in:
Aurélien Bompard 2022-11-18 12:25:07 +01:00
parent 68fb2be40f
commit 4e3fccf6cf
No known key found for this signature in database
GPG key ID: 31584CFEB9BF64AD
1 changed files with 37 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

40
roles/openshift-apps/fmn/templates/deploymentconfig.yml
View file

@ -88,6 +88,16 @@ spec:
- name: etc-fmn
mountPath: "/etc/fmn"
readOnly: true
- name: rabbitmq-ca-volume
mountPath: /etc/pki/rabbitmq/ca
readOnly: true
- name: rabbitmq-key-volume
mountPath: /etc/pki/rabbitmq/key
readOnly: true
- name: rabbitmq-crt-volume
mountPath: /etc/pki/rabbitmq/crt
readOnly: true
env:
- name: APP_SCRIPT
value: ".s2i/run-api.sh"
@ -109,7 +119,7 @@ spec:
readOnly: true
- name: rabbitmq-crt-volume
mountPath: /etc/pki/rabbitmq/crt
readOnly:
readOnly: true
triggers:
- type: ImageChange
imageChangeParams:
@ -162,7 +172,19 @@ spec:
env:
- name: APP_SCRIPT
value: ".s2i/run-consumer.sh"
# No need to list the volumes again
volumes:
- name: etc-fmn
configMap:
name: fmn-config
- name: rabbitmq-ca-volume
mountPath: /etc/pki/rabbitmq/ca
readOnly: true
- name: rabbitmq-key-volume
mountPath: /etc/pki/rabbitmq/key
readOnly: true
- name: rabbitmq-crt-volume
mountPath: /etc/pki/rabbitmq/crt
readOnly: true
triggers:
- type: ImageChange
imageChangeParams:
@ -214,7 +236,19 @@ spec:
env:
- name: APP_SCRIPT
value: ".s2i/run-sender-email.sh"
# No need to list the volumes again
volumes:
- name: etc-fmn
configMap:
name: fmn-config
- name: rabbitmq-ca-volume
mountPath: /etc/pki/rabbitmq/ca
readOnly: true
- name: rabbitmq-key-volume
mountPath: /etc/pki/rabbitmq/key
readOnly: true
- name: rabbitmq-crt-volume
mountPath: /etc/pki/rabbitmq/crt
readOnly: true
triggers:
- type: ImageChange
imageChangeParams: