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

Simplify vars needed for restore CR & do not garbage collect secrets

Browse Source
This commit is contained in:
Christian M. Adams
2021-04-23 17:12:54 -04:00
parent 57f9530198
commit c817a2234d
9 changed files with 62 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
deploy/awx-operator.yaml
View File

@@ -482,13 +482,16 @@ spec:
description: Name of the deployment to be restored to
type: string
tower_backup_pvc:
description: Name of the PVC to be restored from
description: Name of the PVC to be restored from, set as a status found on the awxbackup object (towerBackupClaim)
type: string
tower_backup_pvc_namespace:
description: Namespace the PVC is in
type: string
tower_backup_dir:
description: Backup directory name, a status found on the awxbackup object (towerBackupComplete)
description: Backup directory name, set as a status found on the awxbackup object (towerBackupDirectory)
type: string
tower_backup:
description: AWXBackup object name
type: string
tower_secret_key_secret:
description: Custom secret_key secret name
@@ -506,7 +509,7 @@ spec:
description: Label selector used to identify postgres pod for backing up data
type: string
oneOf:
- required: ["tower_name", "tower_backup_pvc", "tower_backup_pvc_namespace", "tower_backup_dir"]
- required: ["tower_name", "tower_backup_pvc_namespace"]
---
apiVersion: rbac.authorization.k8s.io/v1

9
deploy/crds/awxrestore_v1beta1_crd.yaml
View File

@@ -30,13 +30,16 @@ spec:
description: Name of the deployment to be restored to
type: string
tower_backup_pvc:
description: Name of the PVC to be restored from
description: Name of the PVC to be restored from, set as a status found on the awxbackup object (towerBackupClaim)
type: string
tower_backup_pvc_namespace:
description: Namespace the PVC is in
type: string
tower_backup_dir:
description: Backup directory name, a status found on the awxbackup object (towerBackupComplete)
description: Backup directory name, set as a status found on the awxbackup object (towerBackupDirectory)
type: string
tower_backup:
description: AWXBackup object name
type: string
tower_secret_key_secret:
description: Custom secret_key secret name
@@ -54,4 +57,4 @@ spec:
description: Label selector used to identify postgres pod for backing up data
type: string
oneOf:
- required: ["tower_name", "tower_backup_pvc", "tower_backup_pvc_namespace", "tower_backup_dir"]
- required: ["tower_name", "tower_backup_pvc_namespace"]