mirror of
https://github.com/ansible/awx.git
synced 2026-03-15 07:57:29 -02:30
Fixes ca_trust_dir and project_data_dir for Kubernetes
This commit is contained in:
@@ -133,7 +133,6 @@ secret_key=awxsecret
|
|||||||
# CA Trust directory. If you need to provide custom CA certificates, supplying
|
# CA Trust directory. If you need to provide custom CA certificates, supplying
|
||||||
# this variable causes this directory on the host to be bind mounted over
|
# this variable causes this directory on the host to be bind mounted over
|
||||||
# /etc/pki/ca-trust in the awx_task and awx_web containers.
|
# /etc/pki/ca-trust in the awx_task and awx_web containers.
|
||||||
# NOTE: only obeyed in local_docker install
|
|
||||||
#ca_trust_dir=/etc/pki/ca-trust/source/anchors
|
#ca_trust_dir=/etc/pki/ca-trust/source/anchors
|
||||||
|
|
||||||
# Include /etc/nginx/awx_extra.conf
|
# Include /etc/nginx/awx_extra.conf
|
||||||
|
|||||||
@@ -141,6 +141,16 @@ spec:
|
|||||||
ports:
|
ports:
|
||||||
- containerPort: 8052
|
- containerPort: 8052
|
||||||
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 %}
|
||||||
|
{% if project_data_dir is defined %}
|
||||||
|
- name: {{ kubernetes_deployment_name }}-project-data-dir
|
||||||
|
mountPath: "/var/lib/awx/projects"
|
||||||
|
readOnly: false
|
||||||
|
{% 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
|
||||||
@@ -176,6 +186,16 @@ spec:
|
|||||||
- /usr/bin/launch_awx_task.sh
|
- /usr/bin/launch_awx_task.sh
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
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 %}
|
||||||
|
{% if project_data_dir is defined %}
|
||||||
|
- name: {{ kubernetes_deployment_name }}-project-data-dir
|
||||||
|
mountPath: "/var/lib/awx/projects"
|
||||||
|
readOnly: false
|
||||||
|
{% 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
|
||||||
@@ -274,6 +294,18 @@ spec:
|
|||||||
cpu: "{{ memcached_cpu_limit }}m"
|
cpu: "{{ memcached_cpu_limit }}m"
|
||||||
{% 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 %}
|
||||||
|
{% if project_data_dir is defined %}
|
||||||
|
- name: {{ kubernetes_deployment_name }}-project-data-dir
|
||||||
|
hostPath:
|
||||||
|
path: "{{ project_data_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
|
||||||
|
|||||||
Reference in New Issue
Block a user