External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-15 05:17:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6005 from donomur/ca-trust-fix

Browse Source 
Add CA trust volume to k8s installer management pod

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-04-27 17:36:20 +00:00
committed by GitHub
parent 33ff4ad9be fb567dad1e
commit 83051e9138
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
installer/roles/kubernetes/templates/management-pod.yml.j2
View File

@@ -15,6 +15,12 @@ spec:
imagePullPolicy: Always imagePullPolicy: Always
command: ["sleep", "infinity"] command: ["sleep", "infinity"]
volumeMounts: volumeMounts:
{% if ca_trust_dir is defined %}
- name: {{ kubernetes_deployment_name }}-ca-trust-dir
mountPath: "/etc/pki/ca-trust/source/anchors/"
readOnly: true
{% endif %}
- name: {{ kubernetes_deployment_name }}-application-config - name: {{ kubernetes_deployment_name }}-application-config
mountPath: "/etc/tower/settings.py" mountPath: "/etc/tower/settings.py"
subPath: settings.py subPath: settings.py
@@ -51,6 +57,13 @@ spec:
{{ affinity | to_nice_yaml(indent=2) | indent(width=4, indentfirst=True) }} {{ affinity | to_nice_yaml(indent=2) | indent(width=4, indentfirst=True) }}
{% endif %} {% endif %}
volumes: volumes:
{% if ca_trust_dir is defined %}
- name: {{ kubernetes_deployment_name }}-ca-trust-dir
hostPath:
path: "{{ ca_trust_dir }}"
type: Directory
{% endif %}
- name: {{ kubernetes_deployment_name }}-application-config - name: {{ kubernetes_deployment_name }}-application-config
configMap: configMap:
name: {{ kubernetes_deployment_name }}-config name: {{ kubernetes_deployment_name }}-config