Merge pull request #844 from rooftopcellist/update-changelog

Add Changelog entries for 0.19.0 release
2026-03-27 05:43:11 +00:00 · 2022-03-23 18:20:00 -04:00 · 2022-03-23 18:10:23 -04:00 · 2022-03-22 09:11:19 -04:00 · 2022-03-21 10:50:51 -04:00 · 2022-03-20 16:13:12 +09:00
19 changed files with 832 additions and 784 deletions
--- a/.github/workflows/stage.yml
+++ b/.github/workflows/stage.yml
@@ -60,7 +60,8 @@ jobs:
      - name: Build and stage awx-operator
        working-directory: awx-operator
        run: |
-          BUILD_ARGS="--build-arg DEFAULT_AWX_VERSION=${{ github.event.inputs.default_awx_version }}" \
+          BUILD_ARGS="--build-arg DEFAULT_AWX_VERSION=${{ github.event.inputs.default_awx_version }} \
+                      --build-arg OPERATOR_VERSION=${{ github.event.inputs.version }}" \
          IMAGE_TAG_BASE=ghcr.io/${{ github.repository_owner }}/awx-operator \
          VERSION=${{ github.event.inputs.version }} make docker-build docker-push

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,14 @@

 This is a list of high-level changes for each release of `awx-operator`. A full list of commits can be found at `https://github.com/ansible/awx-operator/releases/tag/<version>`.

-# 0.14.0 (TBA)
+# 0.19.0 (Mar 23, 2022)
+
+- Fix corrupted spec for the service with nodeport type (kurokobo) - dbaf64e
+- Add ability to deploy with OLM & added logo (Christian Adams) - 86c31a4
+- Fix backup & restore issues with special characters in the postgres password (kurokobo) - 589a375
+- Use centos:stream8 container where applicable (Shane McDonald)- 12a58d7
+
+# 0.14.0 (Oct 03, 2021)

 - Starting with awx-operator 0.14.0, the project is now based on operator-sdk 1.x.
  - To avoid a headache, you probably want to delete your existing operator Deployment and follow the README.
--- a/2
+++ b/2
@@ -1,7 +1,9 @@
 FROM quay.io/operator-framework/ansible-operator:v1.12.0

 ARG DEFAULT_AWX_VERSION
+ARG OPERATOR_VERSION
 ENV DEFAULT_AWX_VERSION=${DEFAULT_AWX_VERSION}
+ENV OPERATOR_VERSION=${OPERATOR_VERSION}

 COPY requirements.yml ${HOME}/requirements.yml
 RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \
--- a/1
+++ b/1
@@ -132,7 +132,6 @@ bundle: kustomize ## Generate bundle manifests and metadata, then validate gener
 	operator-sdk generate kustomize manifests -q
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
 	$(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
-	cd config/manifests/bases && python inject-csv-config.py
 	operator-sdk bundle validate ./bundle

 .PHONY: bundle-build
--- a/README.md
+++ b/README.md
@@ -106,23 +106,22 @@ Now you need to deploy AWX Operator into your cluster. Clone this repo and `git
 ```
 $ export NAMESPACE=my-namespace
 $ make deploy
-cd config/manager && /home/user/awx-operator/bin/kustomize edit set image controller=quay.io/ansible/awx-operator:0.14.0
-/home/user/awx-operator/bin/kustomize build config/default | kubectl apply -f -
-namespace/my-namespace created
-customresourcedefinition.apiextensions.k8s.io/awxbackups.awx.ansible.com created
-customresourcedefinition.apiextensions.k8s.io/awxrestores.awx.ansible.com created
-customresourcedefinition.apiextensions.k8s.io/awxs.awx.ansible.com created
-serviceaccount/awx-operator-controller-manager created
-role.rbac.authorization.k8s.io/awx-operator-leader-election-role created
-role.rbac.authorization.k8s.io/awx-operator-manager-role created
-clusterrole.rbac.authorization.k8s.io/awx-operator-metrics-reader created
-clusterrole.rbac.authorization.k8s.io/awx-operator-proxy-role created
-rolebinding.rbac.authorization.k8s.io/awx-operator-leader-election-rolebinding created
-rolebinding.rbac.authorization.k8s.io/awx-operator-manager-rolebinding created
-clusterrolebinding.rbac.authorization.k8s.io/awx-operator-proxy-rolebinding created
-configmap/awx-operator-manager-config created
-service/awx-operator-controller-manager-metrics-service created
-deployment.apps/awx-operator-controller-manager created
+  /home/user/awx-operator/bin/kustomize build config/default | kubectl apply -f -
+  namespace/my-namespace created
+  customresourcedefinition.apiextensions.k8s.io/awxbackups.awx.ansible.com created
+  customresourcedefinition.apiextensions.k8s.io/awxrestores.awx.ansible.com created
+  customresourcedefinition.apiextensions.k8s.io/awxs.awx.ansible.com created
+  serviceaccount/awx-operator-controller-manager created
+  role.rbac.authorization.k8s.io/awx-operator-leader-election-role created
+  role.rbac.authorization.k8s.io/awx-operator-manager-role created
+  clusterrole.rbac.authorization.k8s.io/awx-operator-metrics-reader created
+  clusterrole.rbac.authorization.k8s.io/awx-operator-proxy-role created
+  rolebinding.rbac.authorization.k8s.io/awx-operator-leader-election-rolebinding created
+  rolebinding.rbac.authorization.k8s.io/awx-operator-manager-rolebinding created
+  clusterrolebinding.rbac.authorization.k8s.io/awx-operator-proxy-rolebinding created
+  configmap/awx-operator-manager-config created
+  service/awx-operator-controller-manager-metrics-service created
+  deployment.apps/awx-operator-controller-manager created
 ```

 Wait a bit and you should have the `awx-operator` running:
@@ -139,6 +138,8 @@ So we don't have to keep repeating `-n $NAMESPACE`, let's set the current namesp
 $ kubectl config set-context --current --namespace=$NAMESPACE
 ```

+It is important to know that when you do not set the default namespace to $NAMESPACE that the `awx-operator-controller-manager` might get confused.
+
 Next, create a file named `awx-demo.yml` with the suggested content below. The `metadata.name` you provide, will be the name of the resulting AWX deployment.

 **Note:** If you deploy more than one AWX instance to the same namespace, be sure to use unique names.
@@ -159,6 +160,12 @@ Finally, use `kubectl` to create the awx instance in your cluster:
 $ kubectl apply -f awx-demo.yml
 awx.awx.ansible.com/awx-demo created
 ```
+Or, when you haven't set a default namespace
+
+```
+$ kubectl apply -f awx-demo.yml --namespace=$NAMESPACE
+awx.awx.ansible.com/awx-demo created
+```

 After a few minutes, the new AWX instance will be deployed. You can look at the operator pod logs in order to know where the installation process is at:

@@ -218,11 +225,11 @@ make deploy

 There are three variables that are customizable for the admin user account creation.

-| Name                        | Description                                  | Default          |
-| --------------------------- | -------------------------------------------- | ---------------- |
-| admin_user                  | Name of the admin user                       | admin            |
-| admin_email                 | Email of the admin user                      | test@example.com |
-| admin_password_secret       | Secret that contains the admin user password | Empty string     |
+| Name                  | Description                                  | Default          |
+| --------------------- | -------------------------------------------- | ---------------- |
+| admin_user            | Name of the admin user                       | admin            |
+| admin_email           | Email of the admin user                      | test@example.com |
+| admin_password_secret | Secret that contains the admin user password | Empty string     |


 > :warning: **admin_password_secret must be a Kubernetes secret and not your text clear password**.
@@ -255,10 +262,10 @@ The `service_type` supported options are: `ClusterIP`, `LoadBalancer` and `NodeP

 The following variables are customizable for any `service_type`

-| Name                                  | Description                                   | Default                           |
-| ------------------------------------- | --------------------------------------------- | --------------------------------- |
-| service_labels                  | Add custom labels                             | Empty string                      |
-| service_annotations             | Add service annotations                 | Empty string  |
+| Name                | Description             | Default      |
+| ------------------- | ----------------------- | ------------ |
+| service_labels      | Add custom labels       | Empty string |
+| service_annotations | Add service annotations | Empty string |

 ```yaml
 ---
@@ -275,10 +282,10 @@ spec:

 The following variables are customizable only when `service_type=LoadBalancer`

-| Name                           | Description                              | Default       |
-| ------------------------------ | ---------------------------------------- | ------------- |
-| loadbalancer_protocol    | Protocol to use for Loadbalancer ingress | http          |
-| loadbalancer_port        | Port used for Loadbalancer ingress       | 80            |
+| Name                  | Description                              | Default |
+| --------------------- | ---------------------------------------- | ------- |
+| loadbalancer_protocol | Protocol to use for Loadbalancer ingress | http    |
+| loadbalancer_port     | Port used for Loadbalancer ingress       | 80      |

 ```yaml
 ---
@@ -301,9 +308,9 @@ The HTTPS Load Balancer also uses SSL termination at the Load Balancer level and

 The following variables are customizable only when `service_type=NodePort`

-| Name                           | Description                              | Default       |
-| ------------------------------ | ---------------------------------------- | ------------- |
-| nodeport_port            | Port used for NodePort       | 30080            |
+| Name          | Description            | Default |
+| ------------- | ---------------------- | ------- |
+| nodeport_port | Port used for NodePort | 30080   |

 ```yaml
 ---
@@ -331,13 +338,13 @@ spec:

 The following variables are customizable when `ingress_type=ingress`. The `ingress` type creates an Ingress resource as [documented](https://kubernetes.io/docs/concepts/services-networking/ingress/) which can be shared with many other Ingress Controllers as [listed](https://kubernetes.io/docs/concepts/services-networking/ingress-controllers/).

-| Name                       | Description                              | Default                      |
-| -------------------------- | ---------------------------------------- | ---------------------------- |
-| ingress_annotations        | Ingress annotations                      | Empty string                 |
-| ingress_tls_secret         | Secret that contains the TLS information | Empty string                 |
-| hostname                   | Define the FQDN                          | {{ meta.name }}.example.com  |
-| ingress_path               | Define the ingress path to the service   | /                            |
-| ingress_path_type          | Define the type of the path (for LBs)    | Prefix                       |
+| Name                | Description                              | Default                     |
+| ------------------- | ---------------------------------------- | --------------------------- |
+| ingress_annotations | Ingress annotations                      | Empty string                |
+| ingress_tls_secret  | Secret that contains the TLS information | Empty string                |
+| hostname            | Define the FQDN                          | {{ meta.name }}.example.com |
+| ingress_path        | Define the ingress path to the service   | /                           |
+| ingress_path_type   | Define the type of the path (for LBs)    | Prefix                      |

 ```yaml
 ---
@@ -353,8 +360,8 @@ spec:

 The following variables are customizable when `ingress_type=route`

-| Name                                  | Description                                   | Default                                                 |
-| ------------------------------------- | --------------------------------------------- | --------------------------------------------------------|
+| Name                            | Description                                   | Default                                                 |
+| ------------------------------- | --------------------------------------------- | ------------------------------------------------------- |
 | route_host                      | Common name the route answers for             | `<instance-name>-<namespace>-<routerCanonicalHostname>` |
 | route_tls_termination_mechanism | TLS Termination mechanism (Edge, Passthrough) | Edge                                                    |
 | route_tls_secret                | Secret that contains the TLS information      | Empty string                                            |
@@ -396,7 +403,7 @@ stringData:
 type: Opaque
 ```

-> Please ensure that the value for the variable "password" is wrapped in quotes if the password contains any special characters.
+> Please ensure that the value for the variable `password` should _not_ contain single or double quotes (`'`, `"`) or backslashes (`\`) to avoid any issues during deployment, backup or restoration.

 > It is possible to set a specific username, password, port, or database, but still have the database managed by the operator. In this case, when creating the postgres-configuration secret, the `type: managed` field should be added.

@@ -412,13 +419,14 @@ If you don't have access to an external PostgreSQL service, the AWX operator can

 The following variables are customizable for the managed PostgreSQL service

-| Name                                 | Description                                | Default                           |
-| ------------------------------------ | ------------------------------------------ | --------------------------------- |
-| postgres_image                       | Path of the image to pull                  | postgres:12                       |
-| postgres_resource_requirements       | PostgreSQL container resource requirements | Empty object                      |
-| postgres_storage_requirements        | PostgreSQL container storage requirements  | requests: {storage: 8Gi}          |
-| postgres_storage_class               | PostgreSQL PV storage class                | Empty string                      |
-| postgres_data_path                   | PostgreSQL data path                       | `/var/lib/postgresql/data/pgdata` |
+| Name                                          | Description                                   | Default                           |
+| --------------------------------------------- | --------------------------------------------- | --------------------------------- |
+| postgres_image                                | Path of the image to pull                     | postgres:12                       |
+| postgres_init_container_resource_requirements | Database init container resource requirements | requests: {}                      |
+| postgres_resource_requirements                | PostgreSQL container resource requirements    | requests: {}                      |
+| postgres_storage_requirements                 | PostgreSQL container storage requirements     | requests: {storage: 8Gi}          |
+| postgres_storage_class                        | PostgreSQL PV storage class                   | Empty string                      |
+| postgres_data_path                            | PostgreSQL data path                          | `/var/lib/postgresql/data/pgdata` |

 Example of customization could be:

@@ -452,15 +460,15 @@ spec:

 There are a few variables that are customizable for awx the image management.

-| Name                      | Description                |
-| --------------------------| -------------------------- |
-| image                     | Path of the image to pull  |
-| image_version             | Image version to pull      |
-| image_pull_policy         | The pull policy to adopt   |
-| image_pull_secret         | The pull secret to use     |
-| ee_images                 | A list of EEs to register  |
-| redis_image               | Path of the image to pull  |
-| redis_image_version       | Image version to pull      |
+| Name                | Description               |
+| ------------------- | ------------------------- |
+| image               | Path of the image to pull |
+| image_version       | Image version to pull     |
+| image_pull_policy   | The pull policy to adopt  |
+| image_pull_secret   | The pull secret to use    |
+| ee_images           | A list of EEs to register |
+| redis_image         | Path of the image to pull |
+| redis_image_version | Image version to pull     |

 Example of customization could be:

@@ -517,11 +525,11 @@ Again, this is the most relaxed SCC that is provided by OpenShift, so be sure to

 The resource requirements for both, the task and the web containers are configurable - both the lower end (requests) and the upper end (limits).

-| Name                             | Description                                      | Default                             |
-| -------------------------------- | ------------------------------------------------ | ----------------------------------- |
-| web_resource_requirements        | Web container resource requirements              | requests: {cpu: 1000m, memory: 2Gi} |
-| task_resource_requirements       | Task container resource requirements             | requests: {cpu: 500m, memory: 1Gi}  |
-| ee_resource_requirements         | EE control plane container resource requirements | requests: {cpu: 500m, memory: 1Gi}  |
+| Name                       | Description                                      | Default                             |
+| -------------------------- | ------------------------------------------------ | ----------------------------------- |
+| web_resource_requirements  | Web container resource requirements              | requests: {cpu: 1000m, memory: 2Gi} |
+| task_resource_requirements | Task container resource requirements             | requests: {cpu: 500m, memory: 1Gi}  |
+| ee_resource_requirements   | EE control plane container resource requirements | requests: {cpu: 500m, memory: 1Gi}  |

 Example of customization could be:

@@ -560,15 +568,16 @@ pods to be scheduled onto nodes with matching taints.
 The ability to specify topologySpreadConstraints is also allowed through `topology_spread_constraints`  


-| Name                           | Description                              | Default |
-| -------------------------------| ---------------------------------------- | ------- |
-| postgres_image                 | Path of the image to pull                | 12      |
-| postgres_image_version         | Image version to pull                    | 12      |
-| node_selector                  | AWX pods' nodeSelector                   | ''      |
-| topology_spread_constraints    | AWX pods' topologySpreadConstraints      | ''      |
-| tolerations                    | AWX pods' tolerations                    | ''      |
-| postgres_selector              | Postgres pods' nodeSelector              | ''      |
-| postgres_tolerations           | Postgres pods' tolerations               | ''      |
+| Name                        | Description                         | Default |
+| --------------------------- | ----------------------------------- | ------- |
+| postgres_image              | Path of the image to pull           | 12      |
+| postgres_image_version      | Image version to pull               | 12      |
+| node_selector               | AWX pods' nodeSelector              | ''      |
+| topology_spread_constraints | AWX pods' topologySpreadConstraints | ''      |
+| tolerations                 | AWX pods' tolerations               | ''      |
+| annotations                 | AWX pods' annotations               | ''      |
+| postgres_selector           | Postgres pods' nodeSelector         | ''      |
+| postgres_tolerations        | Postgres pods' tolerations          | ''      |

 Example of customization could be:

@@ -610,10 +619,10 @@ In cases which you need to trust a custom Certificate Authority, there are few v
 Trusting a custom Certificate Authority allows the AWX to access network services configured with SSL certificates issued locally, such as cloning a project from from an internal Git server via HTTPS. It is common for these scenarios, experiencing the error [unable to verify the first certificate](https://github.com/ansible/awx-operator/issues/376).


-| Name                             | Description                              | Default |
-| -------------------------------- | ---------------------------------------- | --------|
-| ldap_cacert_secret               | LDAP Certificate Authority secret name   |  ''     |
-| bundle_cacert_secret             | Certificate Authority secret name        |  ''     |
+| Name                 | Description                            | Default |
+| -------------------- | -------------------------------------- | ------- |
+| ldap_cacert_secret   | LDAP Certificate Authority secret name | ''      |
+| bundle_cacert_secret | Certificate Authority secret name      | ''      |

 Please note the `awx-operator` will look for the data field `ldap-ca.crt` in the specified secret when using the `ldap_cacert_secret`, whereas the data field `bundle-ca.crt` is required for `bundle_cacert_secret` parameter.

@@ -639,13 +648,13 @@ To create the secret, you can use the command below:

 In cases which you want to persist the `/var/lib/projects` directory, there are few variables that are customizable for the `awx-operator`.

-| Name                               | Description                                                                                          | Default        |
-| -----------------------------------| ---------------------------------------------------------------------------------------------------- | ---------------|
-| projects_persistence         | Whether or not the /var/lib/projects directory will be persistent                                    |  false         |
-| projects_storage_class       | Define the PersistentVolume storage class                                                            |  ''            |
-| projects_storage_size        | Define the PersistentVolume size                                                                     |  8Gi           |
-| projects_storage_access_mode | Define the PersistentVolume access mode                                                              |  ReadWriteMany |
-| projects_existing_claim      | Define an existing PersistentVolumeClaim to use (cannot be combined with `projects_storage_*`) |  ''            |
+| Name                         | Description                                                                                    | Default       |
+| ---------------------------- | ---------------------------------------------------------------------------------------------- | ------------- |
+| projects_persistence         | Whether or not the /var/lib/projects directory will be persistent                              | false         |
+| projects_storage_class       | Define the PersistentVolume storage class                                                      | ''            |
+| projects_storage_size        | Define the PersistentVolume size                                                               | 8Gi           |
+| projects_storage_access_mode | Define the PersistentVolume access mode                                                        | ReadWriteMany |
+| projects_existing_claim      | Define an existing PersistentVolumeClaim to use (cannot be combined with `projects_storage_*`) | ''            |

 Example of customization when the `awx-operator` automatically handles the persistent volume could be:

@@ -662,14 +671,14 @@ spec:

 In a scenario where custom volumes and volume mounts are required to either overwrite defaults or mount configuration files.

-| Name                              | Description                                              | Default |
-| --------------------------------- | -------------------------------------------------------- | ------- |
-| extra_volumes                     | Specify extra volumes to add to the application pod      | ''      |
-| web_extra_volume_mounts           | Specify volume mounts to be added to Web container       | ''      |
-| task_extra_volume_mounts          | Specify volume mounts to be added to Task container      | ''      |
-| ee_extra_volume_mounts            | Specify volume mounts to be added to Execution container | ''      |
-| init_container_extra_volume_mounts| Specify volume mounts to be added to Init container      | ''      |
-| init_container_extra_commands     | Specify additional commands for Init container           | ''      |
+| Name                               | Description                                              | Default |
+| ---------------------------------- | -------------------------------------------------------- | ------- |
+| extra_volumes                      | Specify extra volumes to add to the application pod      | ''      |
+| web_extra_volume_mounts            | Specify volume mounts to be added to Web container       | ''      |
+| task_extra_volume_mounts           | Specify volume mounts to be added to Task container      | ''      |
+| ee_extra_volume_mounts             | Specify volume mounts to be added to Execution container | ''      |
+| init_container_extra_volume_mounts | Specify volume mounts to be added to Init container      | ''      |
+| init_container_extra_commands      | Specify additional commands for Init container           | ''      |


 > :warning: The `ee_extra_volume_mounts` and `extra_volumes` will only take effect to the globally available Execution Environments. For custom `ee`, please [customize the Pod spec](https://docs.ansible.com/ansible-tower/latest/html/administration/external_execution_envs.html#customize-the-pod-spec).
@@ -790,11 +799,11 @@ type: kubernetes.io/dockerconfigjson

 If you need to export custom environment variables to your containers.

-| Name                          | Description                                              | Default |
-| ----------------------------- | -------------------------------------------------------- | ------- |
-| task_extra_env                | Environment variables to be added to Task container      | ''      |
-| web_extra_env                 | Environment variables to be added to Web container       | ''      |
-| ee_extra_env                  | Environment variables to be added to EE container        | ''      |
+| Name           | Description                                         | Default |
+| -------------- | --------------------------------------------------- | ------- |
+| task_extra_env | Environment variables to be added to Task container | ''      |
+| web_extra_env  | Environment variables to be added to Web container  | ''      |
+| ee_extra_env   | Environment variables to be added to EE container   | ''      |

 > :warning: The `ee_extra_env` will only take effect to the globally available Execution Environments. For custom `ee`, please [customize the Pod spec](https://docs.ansible.com/ansible-tower/latest/html/administration/external_execution_envs.html#customize-the-pod-spec).

@@ -817,9 +826,9 @@ Example configuration of environment variables

 With`extra_settings`, you can pass multiple custom settings via the `awx-operator`. The parameter `extra_settings`  will be appended to the `/etc/tower/settings.py` and can be an alternative to the `extra_volumes` parameter.

-| Name                          | Description                                              | Default |
-| ----------------------------- | -------------------------------------------------------- | ------- |
-| extra_settings                | Extra settings                                           | ''      |
+| Name           | Description    | Default |
+| -------------- | -------------- | ------- |
+| extra_settings | Extra settings | ''      |

 Example configuration of `extra_settings` parameter

@@ -837,9 +846,9 @@ Example configuration of `extra_settings` parameter

 If you need to modify some `ServiceAccount` proprieties

-| Name                          | Description                                              | Default |
-| ----------------------------- | -------------------------------------------------------- | ------- |
-| service_account_annotations   | Annotations to the ServiceAccount                        | ''      |
+| Name                        | Description                       | Default |
+| --------------------------- | --------------------------------- | ------- |
+| service_account_annotations | Annotations to the ServiceAccount | ''      |

 Example configuration of environment variables

--- a/config/crd/bases/awx.ansible.com_awxs.yaml
+++ b/config/crd/bases/awx.ansible.com_awxs.yaml
@@ -140,6 +140,9 @@ spec:
                service_labels:
                  description: Additional labels to apply to the service
                  type: string
+                annotations:
+                  description: annotations for the pods
+                  type: string
                tolerations:
                  description: node tolerations for the pods
                  type: string
@@ -245,6 +248,28 @@ spec:
                          type: string
                      type: object
                  type: object
+                postgres_init_container_resource_requirements:
+                  description: Resource requirements for the postgres init container
+                  properties:
+                    requests:
+                      properties:
+                        cpu:
+                          type: string
+                        memory:
+                          type: string
+                        storage:
+                          type: string
+                      type: object
+                    limits:
+                      properties:
+                        cpu:
+                          type: string
+                        memory:
+                          type: string
+                        storage:
+                          type: string
+                      type: object
+                  type: object
                service_account_annotations:
                  description: ServiceAccount annotations
                  type: string
--- a/config/manifests/bases/awx-operator.clusterserviceversion.yaml
+++ b/config/manifests/bases/awx-operator.clusterserviceversion.yaml
--- a/config/manifests/bases/inject-csv-config.py
+++ b/config/manifests/bases/inject-csv-config.py
@@ -1,24 +0,0 @@
-'''
-After generating the CSV file, inject custom configuration such as
-OLM parameters, relatedImages, etc.
-'''
-
-import yaml
-
-csv_path = "../../../bundle/manifests/awx-operator.clusterserviceversion.yaml"
-existing_csv = open(csv_path, 'r')
-csv = yaml.safe_load(existing_csv)
-
-
-raw_olm_params = open("olm-parameters.yaml")
-olm_params = yaml.safe_load(raw_olm_params)
-
-# Inject OLM parameters for Customer Resource Objects
-csv['spec']['customresourcedefinitions']['owned'] = olm_params
-
-csv['metadata']['annotations']['alm-examples'] = ''
-
-file_content = yaml.safe_dump(csv, default_flow_style=False, explicit_start=True)
-
-with open(csv_path, 'w') as f:
-    f.write(file_content)
--- a/config/manifests/bases/olm-parameters.yaml
+++ b/config/manifests/bases/olm-parameters.yaml
@@ -1,604 +0,0 @@
---
- displayName: AWX Backup
-  description: Back up a deployment of the awx, including jobs, inventories, and credentials
-  kind: AWXBackup
-  name: awxbackups.awx.ansible.com
-  version: v1beta1
-  specDescriptors:
-  - displayName: Deployment name
-    path: deployment_name
-    x-descriptors:
-      - urn:alm:descriptor:com.tectonic.ui:text
-  - displayName: Backup persistent volume claim
-    path: backup_pvc
-    x-descriptors:
-      - urn:alm:descriptor:com.tectonic.ui:text
-      - urn:alm:descriptor:com.tectonic.ui:advanced
-  - displayName: Backup persistent volume claim namespace
-    path: backup_pvc_namespace
-    x-descriptors:
-      - urn:alm:descriptor:com.tectonic.ui:text
-      - urn:alm:descriptor:com.tectonic.ui:advanced
-  - displayName: Backup PVC storage requirements
-    path: backup_storage_requirements
-    x-descriptors:
-      - urn:alm:descriptor:com.tectonic.ui:text
-      - urn:alm:descriptor:com.tectonic.ui:advanced
-  - displayName: Backup PVC storage class
-    path: backup_storage_class
-    x-descriptors:
-      - urn:alm:descriptor:com.tectonic.ui:text
-      - urn:alm:descriptor:com.tectonic.ui:advanced
-  - displayName: Database backup label selector
-    path: postgres_label_selector
-    x-descriptors:
-      - urn:alm:descriptor:com.tectonic.ui:advanced
-      - urn:alm:descriptor:com.tectonic.ui:hidden
-  - displayName: PostgreSQL Image
-    path: postgres_image
-    x-descriptors:
-      - urn:alm:descriptor:com.tectonic.ui:advanced
-      - urn:alm:descriptor:com.tectonic.ui:hidden
-  - displayName: PostgreSQL Image Version
-    path: postgres_image_version
-    x-descriptors:
-      - urn:alm:descriptor:com.tectonic.ui:advanced
-      - urn:alm:descriptor:com.tectonic.ui:hidden
-  statusDescriptors:
-    - description: The persistent volume claim name used during backup
-      displayName: Backup claim
-      path: backupClaim
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:text
-    - description: The directory data is backed up to on the PVC
-      displayName: Backup directory
-      path: backupDirectory
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:text
- displayName: AWX Restore
-  description: Restore a previous awx deployment into the namespace
-  kind: AWXRestore
-  name: awxrestores.awx.ansible.com
-  version: v1beta1
-  specDescriptors:
-    - displayName: Backup source to restore ?
-      path: backup_source
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:select:CR
-        - urn:alm:descriptor:com.tectonic.ui:select:PVC
-    - displayName: Backup name
-      path: backup_name
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:text
-        - urn:alm:descriptor:com.tectonic.ui:fieldDependency:backup_source:CR
-    - displayName: Name of newly restored deployment
-      path: deployment_name
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:text
-    - displayName: Backup persistent volume claim
-      path: backup_pvc
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:text
-        - urn:alm:descriptor:com.tectonic.ui:fieldDependency:backup_source:PVC
-    - displayName: Backup namespace
-      path: backup_pvc_namespace
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:text
-    - displayName: Backup directory in the persistent volume claim
-      path: backup_dir
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:text
-        - urn:alm:descriptor:com.tectonic.ui:fieldDependency:backup_source:PVC
-    - displayName: Database restore label selector
-      path: postgres_label_selector
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: PostgreSQL Image
-      path: postgres_image
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: PostgreSQL Image Version
-      path: postgres_image_version
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-  statusDescriptors:
-    - description: The state of the restore
-      displayName: Restore status
-      path: restoreComplete
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:text
- description: Deploy a new instance of AWX
-  displayName: AWX
-  kind: AWX
-  name: awxs.awx.ansible.com
-  version: v1beta1
-  specDescriptors:
-    - displayName: Hostname
-      path: hostname
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:text
-    - displayName: Admin account username
-      path: admin_user
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:text
-    - displayName: Admin email address
-      path: admin_email
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:text
-    - displayName: Admin password secret
-      path: admin_password_secret
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:io.kubernetes:Secret
-    - displayName: Database configuration secret
-      path: postgres_configuration_secret
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:io.kubernetes:Secret
-    - displayName: Old Database configuration secret
-      path: old_postgres_configuration_secret
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:io.kubernetes:Secret
-    - displayName: Secret key secret
-      path: secret_key_secret
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:io.kubernetes:Secret
-    - displayName: Broadcast Websocket Secret
-      path: broadcast_websocket_secret
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:io.kubernetes:Secret
-    - displayName: Service Account Annotations
-      path: service_account_annotations
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:text
-    - displayName: Tower Service Type
-      path: service_type
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:select:ClusterIP
-        - urn:alm:descriptor:com.tectonic.ui:select:LoadBalancer
-        - urn:alm:descriptor:com.tectonic.ui:select:NodePort
-    - displayName: Tower Ingress Type
-      path: ingress_type
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:select:none
-        - urn:alm:descriptor:com.tectonic.ui:select:Ingress
-        - urn:alm:descriptor:com.tectonic.ui:select:Route
-    - displayName: Ingress Path
-      path: ingress_path
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:text
-        - urn:alm:descriptor:com.tectonic.ui:fieldDependency:ingress_type:Ingress
-    - displayName: Ingress Path Type
-      path: ingress_path_type
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:text
-        - urn:alm:descriptor:com.tectonic.ui:fieldDependency:ingress_type:Ingress
-    - displayName: Tower Ingress Annotations
-      path: ingress_annotations
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:text
-        - urn:alm:descriptor:com.tectonic.ui:fieldDependency:ingress_type:Ingress
-    - displayName: Tower Ingress TLS Secret
-      path: ingress_tls_secret
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:io.kubernetes:Secret
-        - urn:alm:descriptor:com.tectonic.ui:fieldDependency:ingress_type:Ingress
-    - displayName: Tower LoadBalancer Annotations
-      path: service_annotations
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:text
-        - urn:alm:descriptor:com.tectonic.ui:fieldDependency:service_type:LoadBalancer
-    - displayName: Tower LoadBalancer Protocol
-      path: loadbalancer_protocol
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:select:http
-        - urn:alm:descriptor:com.tectonic.ui:select:https
-        - urn:alm:descriptor:com.tectonic.ui:fieldDependency:service_type:LoadBalancer
-    - displayName: Tower LoadBalancer Port
-      path: loadbalancer_port
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:number
-        - urn:alm:descriptor:com.tectonic.ui:fieldDependency:service_type:LoadBalancer
-    - displayName: Route DNS host
-      path: route_host
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:text
-        - urn:alm:descriptor:com.tectonic.ui:fieldDependency:ingress_type:Route
-    - displayName: Route TLS termination mechanism
-      path: route_tls_termination_mechanism
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:select:Edge
-        - urn:alm:descriptor:com.tectonic.ui:select:Passthrough
-        - urn:alm:descriptor:com.tectonic.ui:fieldDependency:ingress_type:Route
-    - displayName: Route TLS credential secret
-      path: route_tls_secret
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:io.kubernetes:Secret
-        - urn:alm:descriptor:com.tectonic.ui:fieldDependency:ingress_type:Route
-    - displayName: Image Pull Policy
-      path: image_pull_policy
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:imagePullPolicy
-    - displayName: Image Pull Secret
-      path: image_pull_secret
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:io.kubernetes:Secret
-    - displayName: Web container resource requirements
-      path: web_resource_requirements
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:resourceRequirements
-    - displayName: Task container resource requirements
-      path: task_resource_requirements
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:resourceRequirements
-    - displayName: EE Control Plane container resource requirements
-      path: ee_resource_requirements
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:resourceRequirements
-    - displayName: PostgreSQL container resource requirements (when using a managed
-        instance)
-      path: postgres_resource_requirements
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:resourceRequirements
-    - displayName: PostgreSQL container storage requirements (when using a managed
-        instance)
-      path: postgres_storage_requirements
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:resourceRequirements
-    - displayName: Replicas
-      path: replicas
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:number
-    - displayName: Remove used secrets on instance removal ?
-      path: garbage_collect_secrets
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
-    - displayName: Preload instance with data upon creation ?
-      path: create_preload_data
-      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 the task container deployed with privileged level ?
-      path: 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:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: Deployment Kind
-      path: kind
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: Deployment apiVersion
-      path: api_version
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: Image
-      path: image
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: Image Version
-      path: image_version
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: Redis Image
-      path: redis_image
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: Redis Image Version
-      path: redis_image_version
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: Redis Capabilities
-      path: redis_capabilities
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: PostgreSQL Image
-      path: postgres_image
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: PostgreSQL Image Version
-      path: postgres_image_version
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: Postgres Selector
-      path: postgres_selector
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: Postgres Label Selector
-      path: postgres_label_selector
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: Postgres Tolerations
-      path: postgres_tolerations
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: Postgres Storage Class
-      path: postgres_storage_class
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: Postgres Datapath
-      path: postgres_data_path
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: Postgres Extra Arguments
-      path: postgres_extra_args
-      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: LDAP Certificate Authority Trust Bundle
-      path: ldap_cacert_secret
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:io.kubernetes:Secret
-    - displayName: Task Args
-      path: task_args
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: Enable persistence for /var/lib/projects directory?
-      path: projects_persistence
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
-    - displayName: Use existing Persistent Claim?
-      path: projects_use_existing_claim
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:select:_Yes_
-        - urn:alm:descriptor:com.tectonic.ui:select:_No_
-        - urn:alm:descriptor:com.tectonic.ui:fieldDependency:projects_persistence:true
-    - displayName: Projects Existing Persistent Claim
-      path: projects_existing_claim
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:fieldDependency:projects_use_existing_claim:_Yes_
-        - urn:alm:descriptor:io.kubernetes:PersistentVolumeClaim
-    - description: Projects Storage Class Name. If not present, the default storage
-        class will be used.
-      displayName: Projects Storage Class Name
-      path: projects_storage_class
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:fieldDependency:projects_use_existing_claim:_No_
-        - urn:alm:descriptor:com.tectonic.ui:text
-    - description: Projects Storage Size
-      displayName: Projects Storage Size
-      path: projects_storage_size
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:fieldDependency:projects_use_existing_claim:_No_
-        - urn:alm:descriptor:com.tectonic.ui:text
-    - description: Projects Storage Access Mode
-      displayName: Projects Storage Access Mode
-      path: projects_storage_access_mode
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:fieldDependency:projects_use_existing_claim:_No_
-        - urn:alm:descriptor:com.tectonic.ui:text
-    - displayName: Task Command
-      path: task_command
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - description: Environment variables to be added to Task container
-      displayName: Task Extra Env
-      path: task_extra_env
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - description: Specify volume mounts to be added to Execution container
-      displayName: EE Extra Volume Mounts
-      path: ee_extra_volume_mounts
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - description: Registry path to the Execution Environment container to use
-      displayName: EE Images
-      path: ee_images
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - description: Environment variables to be added to EE container
-      displayName: EE Extra Env
-      path: ee_extra_env
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - description: Registry path to the Execution Environment container to use on
-        control plane pods
-      displayName: Control Plane EE Image
-      path: control_plane_ee_image
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - description: EE Images Pull Credentials Secret
-      displayName: EE Images Pull Credentials Secret
-      path: ee_pull_credentials_secret
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:io.kubernetes:Secret
-    - description: Specify volume mounts to be added to Task container
-      displayName: Task Extra Volume Mounts
-      path: task_extra_volume_mounts
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: Web Args
-      path: web_args
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: Web Command
-      path: web_command
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - description: Environment variables to be added to Web container
-      displayName: Web Extra Env
-      path: web_extra_env
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - description: Specify volume mounts to be added to Web container
-      displayName: Web Extra Volume Mounts
-      path: web_extra_volume_mounts
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - description: Specify extra volumes to add to the application pod
-      displayName: Extra Volumes
-      path: extra_volumes
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: Node Selector
-      path: node_selector
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: Topology Spread Constraints
-      path: topology_spread_constraints
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: Service Labels
-      path: service_labels
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:text
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: Tolerations
-      path: tolerations
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: API Extra Settings
-      path: extra_settings
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - displayName: Security Context Settings
-      path: security_context_settings
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - description: Registry path to the init container to use
-      displayName: Init Container Image
-      path: init_container_image
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - description: Init container image version to use
-      displayName: Init Container Image Version
-      path: init_container_image_version
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - description: Specify Extra commands for the Init container
-      displayName: Init Container Extra Commands
-      path: init_container_extra_commands
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - description: Specify volume mounts to be added to Init container
-      displayName: Init Container Extra Volume Mounts
-      path: init_container_extra_volume_mounts
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-    - description: Secret where can be found the trusted Certificate Authority Bundle
-      path: bundle_cacert_secret
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:advanced
-        - urn:alm:descriptor:io.kubernetes:Secret
-    - displayName: Nodeport Port
-      path: nodeport_port
-      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
-      path: URL
-      x-descriptors:
-        - urn:alm:descriptor:org.w3:link
-    - description: Admin user for the instance deployed
-      displayName: Admin User
-      path: adminUser
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:text
-    - description: Admin password for the instance deployed
-      displayName: Admin Password
-      path: adminPasswordSecret
-      x-descriptors:
-        - urn:alm:descriptor:io.kubernetes:Secret
-    - description: Version of the instance deployed
-      displayName: Version
-      path: version
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:text
-    - description: Image of the instance deployed
-      displayName: Image
-      path: image
-      x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:text
--- a/roles/backup/tasks/postgres.yml
+++ b/roles/backup/tasks/postgres.yml
@@ -99,7 +99,7 @@
    command: |
      bash -c """
      set -e -o pipefail
-      PGPASSWORD={{ awx_postgres_pass }} {{ pgdump }} > {{ backup_dir }}/tower.db
+      PGPASSWORD='{{ awx_postgres_pass }}' {{ pgdump }} > {{ backup_dir }}/tower.db
      echo 'Successful'
      """
  register: data_migration
--- a/roles/installer/defaults/main.yml
+++ b/roles/installer/defaults/main.yml
@@ -83,6 +83,12 @@ topology_spread_constraints: ''
 #     effect: "NoSchedule"
 tolerations: ''

+# Add annotations to awx pods. Specify as literal block. E.g.:
+# annotations: |
+#   my.annotation/1: value
+#   my.annotation/2: value2
+annotations: ''
+
 admin_user: admin
 admin_email: test@example.com

@@ -125,7 +131,7 @@ _redis_image_version: latest
 _postgres_image: postgres
 _postgres_image_version: 12
 _init_container_image: quay.io/centos/centos
-_init_container_image_version: 8
+_init_container_image_version: stream8
 image_pull_policy: IfNotPresent
 image_pull_secret: ''

@@ -216,6 +222,7 @@ postgres_tolerations: ''
 postgres_storage_requirements:
  requests:
    storage: 8Gi
+postgres_init_container_resource_requirements: {}
 postgres_resource_requirements: {}
 postgres_data_path: '/var/lib/postgresql/data/pgdata'

--- a/roles/installer/tasks/main.yml
+++ b/roles/installer/tasks/main.yml
@@ -36,6 +36,9 @@
 - name: Include broadcast websocket configuration tasks
  include_tasks: broadcast_websocket_configuration.yml

+- name: Include set_images tasks
+  include_tasks: set_images.yml
+
 - name: Include database configuration tasks
  include_tasks: database_configuration.yml

--- a/roles/installer/tasks/migrate_data.yml
+++ b/roles/installer/tasks/migrate_data.yml
@@ -65,7 +65,7 @@
    command: |
      bash -c """
      set -e -o pipefail
-      PGPASSWORD={{ awx_old_postgres_pass }} {{ pgdump }} | PGPASSWORD={{ awx_postgres_pass }} {{ pg_restore }}
+      PGPASSWORD='{{ awx_old_postgres_pass }}' {{ pgdump }} | PGPASSWORD='{{ awx_postgres_pass }}' {{ pg_restore }}
      echo 'Successful'
      """
  no_log: true
--- a/roles/installer/tasks/resources_configuration.yml
+++ b/roles/installer/tasks/resources_configuration.yml
@@ -47,24 +47,6 @@
  set_fact:
    _image: "{{ _custom_image | default(lookup('env', 'RELATED_IMAGE_AWX')) | default(_default_image, true) }}"

- name: Set default awx init container image
-  set_fact:
-    _default_init_container_image: "{{ _init_container_image }}:{{ _init_container_image_version }}"
-
- name: Set user provided awx init image
-  set_fact:
-    _custom_init_container_image: "{{ init_container_image }}:{{ init_container_image_version }}"
-  when:
-    - init_container_image | default([]) | length
-    - init_container_image_version is defined or init_container_image_version != ''
-
- name: Set Init image URL
-  set_fact:
-    _init_container_image: >-
-      {{ _custom_init_container_image |
-         default(lookup('env', 'RELATED_IMAGE_AWX_INIT_CONTAINER')) |
-         default(_default_init_container_image, true) }}
-
 - name: Set default redis image
  set_fact:
    _default_redis_image: "{{ _redis_image }}:{{ _redis_image_version }}"
--- a/roles/installer/tasks/set_images.yml
+++ b/roles/installer/tasks/set_images.yml
@@ -0,0 +1,19 @@
+# For disconnected environments, images must be set based on the values of `RELATED_IMAGE_` variables
+---
+- name: Set default awx init container image
+  set_fact:
+    _default_init_container_image: "{{ _init_container_image }}:{{ _init_container_image_version }}"
+
+- name: Set user provided awx init image
+  set_fact:
+    _custom_init_container_image: "{{ init_container_image }}:{{ init_container_image_version }}"
+  when:
+    - init_container_image | default([]) | length
+    - init_container_image_version is defined or init_container_image_version != ''
+
+- name: Set Init image URL
+  set_fact:
+    _init_container_image: >-
+      {{ _custom_init_container_image |
+         default(lookup('env', 'RELATED_IMAGE_AWX_INIT_CONTAINER')) |
+         default(_default_init_container_image, true) }}
--- a/roles/installer/templates/deployment.yaml.j2
+++ b/roles/installer/templates/deployment.yaml.j2
@@ -27,6 +27,10 @@ spec:
        app.kubernetes.io/part-of: '{{ ansible_operator_meta.name }}'
        app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
        app.kubernetes.io/component: '{{ deployment_type }}'
+{% if annotations %}
+      annotations:
+        {{ annotations | indent(width=8) }}
+{% endif %}
    spec:
      serviceAccountName: '{{ ansible_operator_meta.name }}'
 {% if image_pull_secret %}
@@ -34,20 +38,6 @@ spec:
        - name: {{ image_pull_secret }}
 {% endif %}
      initContainers:
-{% if managed_database %}
-        - name: database-check
-          image: '{{ _init_container_image }}'
-          imagePullPolicy: '{{ image_pull_policy }}'
-          command:
-            - /bin/sh
-            - -c
-            - |
-              [[ -d /check-db/pgsql/data ]] && rm -rf /check-db/data && mv /check-db/pgsql/data/ /check-db/data/ && rm -rf /check-db/pgsql || true
-          volumeMounts:
-            - name: check-db-pvc
-              mountPath: /check-db
-              subPath: ''
-{% endif %}
 {% if bundle_ca_crt or projects_persistence|bool or init_container_extra_commands %}
        - name: init
          image: '{{ _init_container_image }}'
@@ -340,11 +330,6 @@ spec:
 {% endif %}
 {% endif %}
      volumes:
-{% if managed_database %}
-        - name: check-db-pvc
-          persistentVolumeClaim:
-            claimName: postgres-{{ ansible_operator_meta.name }}-postgres-0
-{% endif %}
 {% if bundle_ca_crt %}
        - name: "ca-trust-extracted"
          emptyDir: {}
--- a/roles/installer/templates/postgres.yaml.j2
+++ b/roles/installer/templates/postgres.yaml.j2
@@ -37,6 +37,20 @@ spec:
      imagePullSecrets:
        - name: {{ image_pull_secret }}
 {% endif %}
+      initContainers:
+        - name: database-check
+          image: '{{ _init_container_image }}'
+          resources: {{ postgres_init_container_resource_requirements }}
+          imagePullPolicy: '{{ image_pull_policy }}'
+          command:
+            - /bin/sh
+            - -c
+            - |
+              [[ -d /check-db/pgsql/data ]] && rm -rf /check-db/data && mv /check-db/pgsql/data/ /check-db/data/ && rm -rf /check-db/pgsql || exit 0
+          volumeMounts:
+            - name: postgres
+              mountPath: /check-db
+              subPath: ''
      containers:
        - image: '{{ _postgres_image }}'
          imagePullPolicy: '{{ image_pull_policy }}'
--- a/roles/installer/templates/service.yaml.j2
+++ b/roles/installer/templates/service.yaml.j2
@@ -17,7 +17,14 @@ metadata:
 {% endif %}
 spec:
  ports:
-{% if service_type | lower != 'loadbalancer' and loadbalancer_protocol | lower != 'https' %}
+  
+{% if service_type | lower == "nodeport" %}
+    - port: 80
+      protocol: TCP
+      targetPort: 8052
+      name: http
+      nodePort: {{ nodeport_port }}
+{% elif service_type | lower != 'loadbalancer' and loadbalancer_protocol | lower != 'https' %}
    - port: 80
      protocol: TCP
      targetPort: 8052
@@ -44,10 +51,10 @@ spec:
    app.kubernetes.io/name: '{{ ansible_operator_meta.name }}'
    app.kubernetes.io/managed-by: '{{ deployment_type }}-operator'
    app.kubernetes.io/component: '{{ deployment_type }}'
-{% if service_type | lower == "loadbalancer" %}
-  type: LoadBalancer
-{% elif service_type | lower == "nodeport" %}
+{% if service_type | lower == "nodeport" %}
  type: NodePort
+{% elif service_type | lower == "loadbalancer" %}
+  type: LoadBalancer
 {% else %}
  type: ClusterIP
 {% endif %}
--- a/roles/restore/tasks/postgres.yml
+++ b/roles/restore/tasks/postgres.yml
@@ -86,7 +86,7 @@
    command: |
      bash -c """
      set -e -o pipefail
-      cat {{ backup_dir }}/tower.db | PGPASSWORD={{ awx_postgres_pass }} {{ pg_restore }}
+      cat {{ backup_dir }}/tower.db | PGPASSWORD='{{ awx_postgres_pass }}' {{ pg_restore }}
      echo 'Successful'
      """
  register: data_migration
Author	SHA1	Message	Date
Christian Adams	ca6ab0a380	Merge pull request #844 from rooftopcellist/update-changelog Add Changelog entries for 0.19.0 release	2022-03-23 18:20:00 -04:00
Christian M. Adams	236bce6970	Add Changelog entries for 0.19.0 release	2022-03-23 18:10:23 -04:00
Shane McDonald	58ac0cc369	Merge pull request #835 from shanemcd/stream8 Use stream8 for init container	2022-03-22 09:11:19 -04:00
Christian Adams	c3ac2e2cde	Merge pull request #838 from kurokobo/quote fix: add quotes for PGPASSWORD for the backup and restore roles	2022-03-21 10:50:51 -04:00
kurokobo	589a3751e1	fix: add quotes for PGPASSWORD for the backup and restore roles	2022-03-20 16:13:12 +09:00
Shane McDonald	12a58d71fb	Use stream8 for init container	2022-03-18 13:56:15 -04:00
Shane McDonald	6b873b05ab	Merge pull request #822 from kurokobo/operator_version fix: add OPERATOR_VERSION as build-arg to pass the version to operator	2022-03-18 11:06:08 -04:00
Christian Adams	5e97ff7c08	Merge pull request #827 from rooftopcellist/rm-inject-params Add AWX Logo to OLM deployments	2022-03-16 14:15:49 -04:00
Christian M. Adams	86c31a4317	Add AWX Logo to OLM deployments * Remove unnecessary script for injecting olm params, use bases template instead Signed-off-by: Christian M. Adams <chadams@redhat.com>	2022-03-16 12:01:28 -04:00
Seth Foster	487727b454	Merge pull request #815 from kurokobo/nodeport fix: fix corrupted spec for the service with nodeport type (#814)	2022-03-15 14:39:13 -04:00
kurokobo	2f47b907fd	fix: add OPERATOR_VERSION as build-arg to pass the version to operator	2022-03-09 22:32:39 +09:00
kurokobo	dbaf64efa0	fix: fix corrupted spec for the service with nodeport type (#814 )	2022-03-09 21:00:24 +09:00
Shane McDonald	5375fec77d	Merge pull request #811 from shanemcd/format-readme-tables Reformat markdown tables in README.md	2022-03-05 12:12:25 -05:00
Shane McDonald	9980192d9e	Reformat markdown tables in README.md	2022-03-05 12:02:18 -05:00
Shane McDonald	e2fc5f46c0	Merge pull request #803 from rooftopcellist/sts-db-check Run database-check initContainer on postgres sts instead	2022-03-05 11:59:00 -05:00
Shane McDonald	5b3be06e8d	Allow for customizing postgres init container resources	2022-03-05 11:48:13 -05:00
Shane McDonald	3c2405f304	Merge pull request #807 from MrBones757/devel added support for pod annotations to awx deployment	2022-03-05 10:18:50 -05:00
Christian M. Adams	192611eea8	Run database-check initContainer on postgres sts instead - This avoids issues with multple initContainers trying to mount the postgres pvc at once, as is the case when there are multiple replicas. Signed-off-by: Christian M. Adams <chadams@redhat.com>	2022-03-05 10:07:07 -05:00
MrBones757	9ca14cef93	added support for pod annotations to awx deployment	2022-02-25 09:54:55 +08:00
Shane McDonald	fbc2d3475c	Merge pull request #800 from ggiinnoo/readme-dummy-proof Added namespace warning \| added apply command for missing namespace	2022-02-23 09:30:19 -05:00
Shane McDonald	58f30fb96c	Merge pull request #789 from ubajze/fix-nodeport-port Fix the custom port specification when service type is NodePort	2022-02-23 09:28:42 -05:00
Gino Jansen	c81b78aad6	Added namespace warning \| added apply command for missing namespace	2022-02-18 14:31:29 +01:00
Uros Bajzelj	536d7dc842	Fix the NodePort port specification	2022-02-11 10:57:43 +00:00