Skip to content

[AAP-89728]fix: mounts the ca bundle correctly and does some DRY work #364

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

Closed
AlexSCorey wants to merge 1 commit into from
Closed

[AAP-89728]fix: mounts the ca bundle correctly and does some DRY work #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions roles/eda/templates/ca-mount-fragment.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{% if bundle_ca_crt %}
- name: "ca-trust-extracted"
mountPath: "/etc/pki/ca-trust/extracted"
- name: "{{ ansible_operator_meta.name }}-bundle-cacert"
mountPath: /etc/pki/ca-trust/source/anchors/bundle-ca.crt
subPath: bundle-ca.crt
readOnly: true
{% endif %}
16 changes: 2 additions & 14 deletions roles/eda/templates/eda-api.deployment.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,14 +362,7 @@ spec:
- name: static-files
mountPath: {{ static_path }}
{% endif %}
{% if bundle_ca_crt %}
- name: "ca-trust-extracted"
mountPath: "/etc/pki/ca-trust/extracted"
- name: "{{ ansible_operator_meta.name }}-bundle-cacert"
mountPath: /etc/pki/ca-trust/source/anchors/bundle-ca.crt
subPath: bundle-ca.crt
readOnly: true
{% endif %}
{{lookup("template", "ca-mount-fragment.yaml.j2") | indent(width=8) | trim }}
{% endif %}
- name: daphne
image: {{ _image }}
Expand Down Expand Up @@ -422,12 +415,7 @@ spec:
{% endif %}
{% if bundle_ca_crt %}
volumeMounts:
- name: "ca-trust-extracted"
mountPath: "/etc/pki/ca-trust/extracted"
- name: "{{ ansible_operator_meta.name }}-bundle-cacert"
mountPath: /etc/pki/ca-trust/source/anchors/bundle-ca.crt
subPath: bundle-ca.crt
readOnly: true
{{lookup("template", "ca-mount-fragment.yaml.j2") | indent(width=8) | trim }}
{% endif %}
- name: nginx
image: {{ _image_web }}
Expand Down
Loading