From 0eb4286b717e2cbdc20d1816fd9086987147cbfa Mon Sep 17 00:00:00 2001 From: Nico Ohnezat Date: Wed, 7 Apr 2021 17:55:18 +0200 Subject: [PATCH] add tower_image_pull_secret as property of AWX resource --- ansible/templates/crd.yml.j2 | 3 +++ deploy/awx-operator.yaml | 3 +++ deploy/crds/awx_v1beta1_crd.yaml | 3 +++ .../manifests/awx-operator.clusterserviceversion.yaml | 5 +++++ .../awx-operator/manifests/awx.ansible.com_awxs_crd.yaml | 3 +++ 5 files changed, 17 insertions(+) diff --git a/ansible/templates/crd.yml.j2 b/ansible/templates/crd.yml.j2 index a6fa5c48..beec0b25 100644 --- a/ansible/templates/crd.yml.j2 +++ b/ansible/templates/crd.yml.j2 @@ -134,6 +134,9 @@ spec: - never - IfNotPresent - ifnotpresent + tower_image_pull_secret: + description: The image pull secret + type: string tower_task_resource_requirements: description: Resource requirements for the task container properties: diff --git a/deploy/awx-operator.yaml b/deploy/awx-operator.yaml index b47a798c..63f17140 100644 --- a/deploy/awx-operator.yaml +++ b/deploy/awx-operator.yaml @@ -285,6 +285,9 @@ spec: - never - IfNotPresent - ifnotpresent + tower_image_pull_secret: + description: The image pull secret + type: string tower_task_resource_requirements: description: Resource requirements for the task container properties: diff --git a/deploy/crds/awx_v1beta1_crd.yaml b/deploy/crds/awx_v1beta1_crd.yaml index a6fa5c48..beec0b25 100644 --- a/deploy/crds/awx_v1beta1_crd.yaml +++ b/deploy/crds/awx_v1beta1_crd.yaml @@ -134,6 +134,9 @@ spec: - never - IfNotPresent - ifnotpresent + tower_image_pull_secret: + description: The image pull secret + type: string tower_task_resource_requirements: description: Resource requirements for the task container properties: 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 61802855..3c0ef836 100644 --- a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml @@ -155,6 +155,11 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:imagePullPolicy + - displayName: Image Pull Secret + path: tower_image_pull_secret + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:imagePullSecret - displayName: Web container resource requirements path: tower_web_resource_requirements x-descriptors: 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 91487401..df506260 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 @@ -108,6 +108,9 @@ spec: - IfNotPresent - ifnotpresent type: string + tower_image_pull_secret: + description: The image pull secret + type: string tower_ingress_annotations: description: Annotations to add to the ingress type: string