internet/awx-operator
3
0
Fork 0
mirror of https://github.com/ansible/awx-operator.git synced 2026-05-08 06:12:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Persist secret names from old deployment & add them to the spec

Browse Source 
- renamed some more variables to be consistent with the pulp-operator
  - removed unneeded vars from backup & restore crds
  - added a way to parse spec at restore time by including vars to
    get around the issue of triply nested quotes when using to_json
This commit is contained in:
Christian M. Adams
2021-04-30 03:57:05 -04:00
parent bd6a5c3156
commit 8af0681373
21 changed files with 95 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
deploy/awx-operator.yaml
View File

@@ -353,13 +353,13 @@ spec:
towerAdminPasswordSecret:
description: Admin password secret name of the deployed instance
type: string
towerPostgresConfigurationSecret:
postgresConfigurationSecret:
description: Postgres Configuration secret name of the deployed instance
type: string
towerBroadcastWebsocketSecret:
broadcastWebsocketSecret:
description: Broadcast websocket secret name of the deployed instance
type: string
towerSecretKeySecret:
secretKeySecret:
description: Secret key secret name of the deployed instance
type: string
towerMigratedFromSecret:
@@ -431,22 +431,9 @@ spec:
backup_storage_class:
description: Storage class to use when creating PVC for backup
type: string
tower_secret_key_secret:
description: Custom secret_key secret name
type: string
tower_admin_password_secret:
description: Custom admin_password secret name
type: string
tower_broadcast_websocket_secret:
description: Custom broadcast_websocket secret name
type: string
tower_postgres_configuration_secret:
description: Custom postgres_configuration secret name
type: string
postgres_label_selector:
description: Label selector used to identify postgres pod for backing up data
type: string
oneOf:
- required: ["deployment_name"]
@@ -481,7 +468,7 @@ spec:
deployment_name:
description: Name of the deployment to be restored to
type: string
backup:
backup_name:
description: AWXBackup object name
type: string
backup_pvc:
@@ -493,18 +480,6 @@ spec:
backup_dir:
description: Backup directory name, set as a status found on the awxbackup object (backupDirectory)
type: string
tower_secret_key_secret:
description: Custom secret_key secret name
type: string
tower_admin_password_secret:
description: Custom admin_password secret name
type: string
tower_broadcast_websocket_secret:
description: Custom broadcast_websocket secret name
type: string
tower_postgres_configuration_secret:
description: Custom postgres_configuration secret name
type: string
postgres_label_selector:
description: Label selector used to identify postgres pod for backing up data
type: string

6
deploy/crds/awx_v1beta1_crd.yaml
View File

@@ -351,13 +351,13 @@ spec:
towerAdminPasswordSecret:
description: Admin password secret name of the deployed instance
type: string
towerPostgresConfigurationSecret:
postgresConfigurationSecret:
description: Postgres Configuration secret name of the deployed instance
type: string
towerBroadcastWebsocketSecret:
broadcastWebsocketSecret:
description: Broadcast websocket secret name of the deployed instance
type: string
towerSecretKeySecret:
secretKeySecret:
description: Secret key secret name of the deployed instance
type: string
towerMigratedFromSecret:

13
deploy/crds/awxbackup_v1beta1_crd.yaml
View File

@@ -41,21 +41,8 @@ spec:
backup_storage_class:
description: Storage class to use when creating PVC for backup
type: string
tower_secret_key_secret:
description: Custom secret_key secret name
type: string
tower_admin_password_secret:
description: Custom admin_password secret name
type: string
tower_broadcast_websocket_secret:
description: Custom broadcast_websocket secret name
type: string
tower_postgres_configuration_secret:
description: Custom postgres_configuration secret name
type: string
postgres_label_selector:
description: Label selector used to identify postgres pod for backing up data
type: string
oneOf:
- required: ["deployment_name"]

14
deploy/crds/awxrestore_v1beta1_crd.yaml
View File

@@ -29,7 +29,7 @@ spec:
deployment_name:
description: Name of the deployment to be restored to
type: string
backup:
backup_name:
description: AWXBackup object name
type: string
backup_pvc:
@@ -41,18 +41,6 @@ spec:
backup_dir:
description: Backup directory name, set as a status found on the awxbackup object (backupDirectory)
type: string
tower_secret_key_secret:
description: Custom secret_key secret name
type: string
tower_admin_password_secret:
description: Custom admin_password secret name
type: string
tower_broadcast_websocket_secret:
description: Custom broadcast_websocket secret name
type: string
tower_postgres_configuration_secret:
description: Custom postgres_configuration secret name
type: string
postgres_label_selector:
description: Label selector used to identify postgres pod for backing up data
type: string