From 90f25ab20cef7a420338428b41dc0b61f71c59cb Mon Sep 17 00:00:00 2001 From: Gabe Muniz Date: Thu, 15 Apr 2021 09:51:45 -0400 Subject: [PATCH] added ability to mount to Execution container with example --- README.md | 51 ++++++++++--------- ansible/templates/crd.yml.j2 | 3 ++ .../awx-operator.clusterserviceversion.yaml | 10 +++- .../manifests/awx.ansible.com_awxs_crd.yaml | 3 ++ .../templates/tower_deployment.yaml.j2 | 3 ++ 5 files changed, 45 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 1cf7b33c..068e6d86 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ An [Ansible AWX](https://github.com/ansible/awx) operator for Kubernetes built w * [Containers Resource Requirements](#containers-resource-requirements) * [LDAP Certificate Authority](#ldap-certificate-authority) * [Persisting Projects Directory](#persisting-projects-directory) - * [Custom Volume and Volume Mount Options](#custom-volume-volume-mount-options) + * [Custom Volume and Volume Mount Options](#custom-volume-and-volume-mount-options) * [Development](#development) * [Testing](#testing) * [Testing in Docker](#testing-in-docker) @@ -420,6 +420,7 @@ In a scenario where custom volumes and volume mounts are required to either over | tower_extra_volumes | Specify extra volumes to add to the application pod | '' | | tower_web_extra_volume_mounts | Specify volume mounts to be added to Web container | '' | | tower_task_extra_volume_mounts | Specify volume mounts to be added to Task container | '' | +| tower_ee_extra_volume_mounts | Specify volume mounts to be added to Execution container | '' | Example configuration for ConfigMap @@ -444,29 +445,33 @@ Example spec file for volumes and volume mounts ```yaml --- - tower_task_extra_volume_mounts: | - - name: ansible-cfg - mountPath: /etc/ansible/ansible.cfg - subPath: ansible.cfg - - name: custom-py - mountPath: /etc/tower/conf.d/custom.py - subPath: custom.py + spec: + ... + tower_ee_extra_volume_mounts: | + - name: ansible-cfg + mountPath: /etc/ansible/ansible.cfg + subPath: ansible.cfg - tower_extra_volumes: | - - name: ansible-cfg - configMap: - defaultMode: 420 - items: - - key: ansible.cfg - path: ansible.cfg - name: -extra-config - - name: custom-py - configMap: - defaultMode: 420 - items: - - key: custom.py - path: custom.py - name: -extra-config + tower_task_extra_volume_mounts: | + - name: custom-py + mountPath: /etc/tower/conf.d/custom.py + subPath: custom.py + + tower_extra_volumes: | + - name: ansible-cfg + configMap: + defaultMode: 420 + items: + - key: ansible.cfg + path: ansible.cfg + name: -extra-config + - name: custom-py + configMap: + defaultMode: 420 + items: + - key: custom.py + path: custom.py + name: -extra-config ``` diff --git a/ansible/templates/crd.yml.j2 b/ansible/templates/crd.yml.j2 index b9e1fe46..17f07c18 100644 --- a/ansible/templates/crd.yml.j2 +++ b/ansible/templates/crd.yml.j2 @@ -214,6 +214,9 @@ spec: type: string tower_web_extra_env: type: string + tower_ee_extra_volume_mounts: + description: Specify volume mounts to be added to Execution container + type: string tower_task_extra_volume_mounts: description: Specify volume mounts to be added to Task container type: string diff --git a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml index 5868be56..0fea86e0 100644 --- a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml @@ -299,12 +299,18 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:hidden + - displayName: + path: tower_ee_extra_volume_mounts + description: Specify volume mounts to be added to Execution container + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:hidden - displayName: Tower Task Extra Volume Mounts description: Specify volume mounts to be added to Task container path: tower_task_extra_volume_mounts x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - - urn:alm:descriptor:com.tectonic.ui:text + - urn:alm:descriptor:com.tectonic.ui:hidden - displayName: Tower Web Args path: tower_web_args x-descriptors: @@ -325,7 +331,7 @@ spec: path: tower_web_extra_volume_mounts x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - - urn:alm:descriptor:com.tectonic.ui:text + - urn:alm:descriptor:com.tectonic.ui:hidden - displayName: Tower Extra Volumes description: Specify extra volumes to add to the application pod path: tower_extra_volumes diff --git a/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml b/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml index 9124d98b..1d684484 100644 --- a/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml +++ b/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml @@ -226,6 +226,9 @@ spec: type: array tower_task_extra_env: type: string + tower_ee_extra_volume_mounts: + description: Specify volume mounts to be added to Execution container + type: string tower_task_extra_volume_mounts: description: Specify volume mounts to be added to Task container type: string diff --git a/roles/installer/templates/tower_deployment.yaml.j2 b/roles/installer/templates/tower_deployment.yaml.j2 index 75373deb..42c334ec 100644 --- a/roles/installer/templates/tower_deployment.yaml.j2 +++ b/roles/installer/templates/tower_deployment.yaml.j2 @@ -214,6 +214,9 @@ spec: mountPath: "/var/run/receptor" - name: "{{ meta.name }}-projects" mountPath: "/var/lib/awx/projects" +{% if tower_ee_extra_volume_mounts -%} + {{ tower_ee_extra_volume_mounts | indent(width=12, indentfirst=True) }} +{% endif %} {% if development_mode | bool %} env: - name: SDB_NOTIFY_HOST