From 9cfb7921bc6b180e8529cf5400d5d088cb8f48be Mon Sep 17 00:00:00 2001 From: "Christian M. Adams" Date: Wed, 28 Apr 2021 01:51:29 -0400 Subject: [PATCH] update templated files with new var names --- deploy/awx-operator.yaml | 34 ++++++++++++------------- deploy/crds/awxbackup_v1beta1_crd.yaml | 14 +++++----- deploy/crds/awxrestore_v1beta1_crd.yaml | 20 +++++++-------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/deploy/awx-operator.yaml b/deploy/awx-operator.yaml index 67cfe045..57fc0ea3 100644 --- a/deploy/awx-operator.yaml +++ b/deploy/awx-operator.yaml @@ -416,19 +416,19 @@ spec: spec: type: object properties: - tower_name: + deployment_name: description: Name of the deployment to be backed up type: string - tower_backup_pvc: + backup_pvc: description: Name of the PVC to be used for storing the backup type: string - tower_backup_pvc_namespace: + backup_pvc_namespace: description: Namespace PVC is in type: string - tower_backup_size: - description: Size of PVC + backup_storage_requirements: + description: Storage requirements for the PostgreSQL container type: string - tower_backup_storage_class: + backup_storage_class: description: Storage class to use when creating PVC for backup type: string tower_secret_key_secret: @@ -448,7 +448,7 @@ spec: type: string oneOf: - - required: ["tower_name"] + - required: ["deployment_name"] --- apiVersion: apiextensions.k8s.io/v1 @@ -478,20 +478,20 @@ spec: spec: type: object properties: - tower_name: + deployment_name: description: Name of the deployment to be restored to type: string - tower_backup_pvc: - description: Name of the PVC to be restored from, set as a status found on the awxbackup object (towerBackupClaim) + backup: + description: AWXBackup object name type: string - tower_backup_pvc_namespace: + backup_pvc: + description: Name of the PVC to be restored from, set as a status found on the awxbackup object (backupClaim) + type: string + backup_pvc_namespace: description: Namespace the PVC is in type: string - tower_backup_dir: - description: Backup directory name, set as a status found on the awxbackup object (towerBackupDirectory) - type: string - tower_backup: - description: AWXBackup object name + 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 @@ -509,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_namespace"] + - required: ["deployment_name", "backup_pvc_namespace"] --- apiVersion: rbac.authorization.k8s.io/v1 diff --git a/deploy/crds/awxbackup_v1beta1_crd.yaml b/deploy/crds/awxbackup_v1beta1_crd.yaml index 21e388f3..fd5f04be 100644 --- a/deploy/crds/awxbackup_v1beta1_crd.yaml +++ b/deploy/crds/awxbackup_v1beta1_crd.yaml @@ -26,19 +26,19 @@ spec: spec: type: object properties: - tower_name: + deployment_name: description: Name of the deployment to be backed up type: string - tower_backup_pvc: + backup_pvc: description: Name of the PVC to be used for storing the backup type: string - tower_backup_pvc_namespace: + backup_pvc_namespace: description: Namespace PVC is in type: string - tower_backup_size: - description: Size of PVC + backup_storage_requirements: + description: Storage requirements for the PostgreSQL container type: string - tower_backup_storage_class: + backup_storage_class: description: Storage class to use when creating PVC for backup type: string tower_secret_key_secret: @@ -58,4 +58,4 @@ spec: type: string oneOf: - - required: ["tower_name"] + - required: ["deployment_name"] diff --git a/deploy/crds/awxrestore_v1beta1_crd.yaml b/deploy/crds/awxrestore_v1beta1_crd.yaml index db5c4e13..8a91ce07 100644 --- a/deploy/crds/awxrestore_v1beta1_crd.yaml +++ b/deploy/crds/awxrestore_v1beta1_crd.yaml @@ -26,20 +26,20 @@ spec: spec: type: object properties: - tower_name: + deployment_name: description: Name of the deployment to be restored to type: string - tower_backup_pvc: - description: Name of the PVC to be restored from, set as a status found on the awxbackup object (towerBackupClaim) + backup: + description: AWXBackup object name type: string - tower_backup_pvc_namespace: + backup_pvc: + description: Name of the PVC to be restored from, set as a status found on the awxbackup object (backupClaim) + type: string + backup_pvc_namespace: description: Namespace the PVC is in type: string - tower_backup_dir: - description: Backup directory name, set as a status found on the awxbackup object (towerBackupDirectory) - type: string - tower_backup: - description: AWXBackup object name + 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 @@ -57,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_namespace"] + - required: ["deployment_name", "backup_pvc_namespace"]