diff --git a/config/crd/bases/awx.ansible.com_awxrestores.yaml b/config/crd/bases/awx.ansible.com_awxrestores.yaml index 0192a1e8..d841d5fc 100644 --- a/config/crd/bases/awx.ansible.com_awxrestores.yaml +++ b/config/crd/bases/awx.ansible.com_awxrestores.yaml @@ -94,6 +94,11 @@ spec: postgres_image_version: description: PostgreSQL container image version to use type: string + spec_overrides: + description: Overrides for the AWX spec + # type: string + type: object + x-kubernetes-preserve-unknown-fields: true image_pull_policy: description: The image pull policy type: string diff --git a/config/manifests/bases/awx-operator.clusterserviceversion.yaml b/config/manifests/bases/awx-operator.clusterserviceversion.yaml index f7af28f4..268dba6c 100644 --- a/config/manifests/bases/awx-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/awx-operator.clusterserviceversion.yaml @@ -218,6 +218,10 @@ spec: path: postgres_image_version x-descriptors: - urn:alm:descriptor:com.tectonic.ui:hidden + - displayName: AWX Spec Overrides + path: spec_overrides + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced - displayName: Image Pull Policy path: image_pull_policy x-descriptors: diff --git a/roles/restore/defaults/main.yml b/roles/restore/defaults/main.yml index 5eaf29b4..36c5f345 100644 --- a/roles/restore/defaults/main.yml +++ b/roles/restore/defaults/main.yml @@ -39,4 +39,6 @@ additional_labels: [] # Maintain some of the recommended `app.kubernetes.io/*` labels on the resource (self) set_self_labels: true + +spec_overrides: {} ... diff --git a/roles/restore/tasks/deploy_awx.yml b/roles/restore/tasks/deploy_awx.yml index a2c13867..ffae98ba 100644 --- a/roles/restore/tasks/deploy_awx.yml +++ b/roles/restore/tasks/deploy_awx.yml @@ -1,5 +1,10 @@ --- +- name: Combine spec_overrides with spec + set_fact: + spec: "{{ spec | default({}) | combine(spec_overrides) }}" + no_log: "{{ no_log }}" + - name: Deploy AWX k8s: state: "{{ state | default('present') }}"