From 451e2b6497cba7fa2bb6621ba13b3f07e644f8dc Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Mon, 22 Mar 2021 10:51:14 +0100 Subject: [PATCH 1/2] Update bundle variables to catchup with latest commits --- ansible/templates/crd.yml.j2 | 2 + deploy/awx-operator.yaml | 2 + deploy/crds/awx_v1beta1_crd.yaml | 2 + .../awx-operator.clusterserviceversion.yaml | 73 +++++++++++++++++++ .../manifests/awx.ansible.com_awxs_crd.yaml | 2 + 5 files changed, 81 insertions(+) diff --git a/ansible/templates/crd.yml.j2 b/ansible/templates/crd.yml.j2 index b7cd32bc..0cbda243 100644 --- a/ansible/templates/crd.yml.j2 +++ b/ansible/templates/crd.yml.j2 @@ -29,9 +29,11 @@ spec: tower_task_privileged: description: If a privileged security context should be enabled type: boolean + default: false tower_admin_user: description: Username to use for the admin account type: string + default: admin tower_hostname: description: The hostname of the instance type: string diff --git a/deploy/awx-operator.yaml b/deploy/awx-operator.yaml index 18a76fa5..5d3b7f3f 100644 --- a/deploy/awx-operator.yaml +++ b/deploy/awx-operator.yaml @@ -180,9 +180,11 @@ spec: tower_task_privileged: description: If a privileged security context should be enabled type: boolean + default: false tower_admin_user: description: Username to use for the admin account type: string + default: admin tower_hostname: description: The hostname of the instance type: string diff --git a/deploy/crds/awx_v1beta1_crd.yaml b/deploy/crds/awx_v1beta1_crd.yaml index b7cd32bc..0cbda243 100644 --- a/deploy/crds/awx_v1beta1_crd.yaml +++ b/deploy/crds/awx_v1beta1_crd.yaml @@ -29,9 +29,11 @@ spec: tower_task_privileged: description: If a privileged security context should be enabled type: boolean + default: false tower_admin_user: description: Username to use for the admin account type: string + default: admin tower_hostname: description: The hostname of the instance 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 e73702ee..2b465798 100644 --- a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml @@ -99,6 +99,7 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:io.kubernetes:Secret + - displayName: Old Database configuration secret path: tower_old_postgres_configuration_secret x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced @@ -207,6 +208,18 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:booleanSwitch + - displayName: Deploy the instance in development mode ? + path: development_mode + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:booleanSwitch + - urn:alm:descriptor:com.tectonic.ui:hidden + - displayName: Should Tower Task container deployed with prileged level ? + path: tower_task_privileged + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:booleanSwitch + - urn:alm:descriptor:com.tectonic.ui:hidden - displayName: Deployment Type path: deployment_type x-descriptors: @@ -217,16 +230,76 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:hidden + - displayName: Redis Image + path: tower_redis_image + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:hidden + - displayName: PostgreSQL Image + path: tower_postgres_image + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:hidden - displayName: Tower Postgres Storage Class path: tower_postgres_storage_class x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:hidden + - displayName: Tower Postgres Datapath + path: tower_postgres_data_path + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:hidden - displayName: Certificate Authorirty Trust Bundle path: ca_trust_bundle x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:hidden + - displayName: Tower Task Args + path: tower_task_args + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:hidden + - displayName: Tower Task Command + path: tower_task_command + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:hidden + - displayName: Tower Task Extra Env + path: tower_task_extra_env + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:hidden + - displayName: Tower Task Extra Volume Mounts + path: tower_task_extra_volume_mounts + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:hidden + - displayName: Tower Web Args + path: tower_web_args + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:hidden + - displayName: Tower Web Command + path: tower_web_command + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:hidden + - displayName: Tower Web Extra Env + path: tower_web_extra_env + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:hidden + - displayName: Tower Web Extra Volume Mounts + path: tower_web_extra_volume_mounts + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:hidden + - displayName: Tower Extra Volumes + path: tower_extra_volumes + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:hidden statusDescriptors: - description: Route to access the instance deployed displayName: URL 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 667e0ce3..ecb933df 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 @@ -37,6 +37,7 @@ spec: tower_admin_user: description: Username to use for the admin account type: string + default: admin tower_broadcast_websocket_secret: description: Secret where the broadcast websocket secret can be found type: string @@ -177,6 +178,7 @@ spec: tower_task_privileged: description: If a privileged security context should be enabled type: boolean + default: false tower_task_resource_requirements: description: Resource requirements for the task container properties: From 7010ab1fc67cde12b04bc77d57d7f58fd6c56101 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Wed, 24 Mar 2021 11:52:33 -0400 Subject: [PATCH 2/2] Update deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml --- .../manifests/awx-operator.clusterserviceversion.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2b465798..0f08f1c3 100644 --- a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml @@ -214,7 +214,7 @@ spec: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:booleanSwitch - urn:alm:descriptor:com.tectonic.ui:hidden - - displayName: Should Tower Task container deployed with prileged level ? + - displayName: Should Tower Task container deployed with privileged level ? path: tower_task_privileged x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced