From 5f183999d0b77c3ce31775d53aa06880adcf666b Mon Sep 17 00:00:00 2001 From: Christian Adams Date: Wed, 31 Aug 2022 17:06:01 -0400 Subject: [PATCH] Fix restore resource requirements field name for management pod resources (#1044) --- .../crd/bases/awx.ansible.com_awxbackups.yaml | 2 +- .../bases/awx.ansible.com_awxrestores.yaml | 4 +- .../awxbackup.ansible.com_awxbackups.yaml | 105 ------------------ .../awxrestore.ansible.com_awxrestores.yaml | 104 ----------------- 4 files changed, 3 insertions(+), 212 deletions(-) delete mode 100644 config/crd/bases/awxbackup.ansible.com_awxbackups.yaml delete mode 100644 config/crd/bases/awxrestore.ansible.com_awxrestores.yaml diff --git a/config/crd/bases/awx.ansible.com_awxbackups.yaml b/config/crd/bases/awx.ansible.com_awxbackups.yaml index 9d46d2d2..12add00b 100644 --- a/config/crd/bases/awx.ansible.com_awxbackups.yaml +++ b/config/crd/bases/awx.ansible.com_awxbackups.yaml @@ -55,7 +55,7 @@ spec: description: Storage requirements for backup PVC (may be similar to existing postgres PVC backing up from) type: string backup_resource_requirements: - description: Resource requirements for the task container + description: Resource requirements for the management pod used to create a backup properties: requests: properties: diff --git a/config/crd/bases/awx.ansible.com_awxrestores.yaml b/config/crd/bases/awx.ansible.com_awxrestores.yaml index ab5512c7..7e525271 100644 --- a/config/crd/bases/awx.ansible.com_awxrestores.yaml +++ b/config/crd/bases/awx.ansible.com_awxrestores.yaml @@ -62,8 +62,8 @@ spec: backup_dir: description: Backup directory name, set as a status found on the awxbackup object (backupDirectory) type: string - backup_resource_requirements: - description: Resource requirements for the management pod that backs up AWX + restore_resource_requirements: + description: Resource requirements for the management pod that restores AWX from a backup properties: requests: properties: diff --git a/config/crd/bases/awxbackup.ansible.com_awxbackups.yaml b/config/crd/bases/awxbackup.ansible.com_awxbackups.yaml deleted file mode 100644 index 0829095f..00000000 --- a/config/crd/bases/awxbackup.ansible.com_awxbackups.yaml +++ /dev/null @@ -1,105 +0,0 @@ ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - name: awxbackups.awx.ansible.com -spec: - group: awx.ansible.com - names: - kind: AWXBackup - listKind: AWXBackupList - plural: awxbackups - singular: awxbackup - scope: Namespaced - versions: - - name: v1beta1 - served: true - storage: true - subresources: - status: {} - schema: - openAPIV3Schema: - type: object - x-kubernetes-preserve-unknown-fields: true - description: Schema validation for the AWXBackup CRD - properties: - spec: - type: object - required: - - deployment_name - properties: - backup_resource_requirements: - description: Resource requirements for the task container - properties: - requests: - properties: - cpu: - type: string - memory: - type: string - type: object - limits: - properties: - cpu: - type: string - memory: - type: string - type: object - type: object - deployment_name: - description: Name of the deployment to be backed up - type: string - backup_pvc: - description: Name of the backup PVC - type: string - backup_pvc_namespace: - description: (Deprecated) Namespace the PVC is in - type: string - backup_storage_requirements: - description: Storage requirements for backup PVC (may be similar to existing postgres PVC backing up from) - type: string - backup_storage_class: - description: Storage class to use when creating PVC for backup - type: string - clean_backup_on_delete: - description: Flag to indicate if backup should be deleted on PVC if AWXBackup object is deleted - type: boolean - postgres_label_selector: - description: Label selector used to identify postgres pod for backing up data - type: string - postgres_image: - description: Registry path to the PostgreSQL container to use - type: string - postgres_image_version: - description: PostgreSQL container image version to use - type: string - no_log: - description: Configure no_log for no_log tasks - type: string - set_self_labels: - description: Maintain some of the recommended `app.kubernetes.io/*` labels on the resource (self) - type: boolean - default: true - status: - type: object - properties: - conditions: - description: The resulting conditions when a Service Telemetry is instantiated - items: - properties: - lastTransitionTime: - type: string - reason: - type: string - status: - type: string - type: - type: string - type: object - type: array - backupDirectory: - description: Backup directory name on the specified pvc - type: string - backupClaim: - description: Backup persistent volume claim - type: string diff --git a/config/crd/bases/awxrestore.ansible.com_awxrestores.yaml b/config/crd/bases/awxrestore.ansible.com_awxrestores.yaml deleted file mode 100644 index 374398f4..00000000 --- a/config/crd/bases/awxrestore.ansible.com_awxrestores.yaml +++ /dev/null @@ -1,104 +0,0 @@ ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - name: awxrestores.awx.ansible.com -spec: - group: awx.ansible.com - names: - kind: AWXRestore - listKind: AWXRestoreList - plural: awxrestores - singular: awxrestore - scope: Namespaced - versions: - - name: v1beta1 - served: true - storage: true - subresources: - status: {} - schema: - openAPIV3Schema: - type: object - x-kubernetes-preserve-unknown-fields: true - description: Schema validation for the AWXRestore CRD - properties: - spec: - type: object - properties: - backup_source: - description: Backup source - type: string - enum: - - CR - - PVC - restore_resource_requirements: - description: Resource requirements for the management pod the restores the database to the new AWX instance - properties: - requests: - properties: - cpu: - type: string - memory: - type: string - type: object - limits: - properties: - cpu: - type: string - memory: - type: string - type: object - type: object - deployment_name: - description: Name of the restored deployment. This should be different from the original deployment name - if the original deployment still exists. - type: string - backup_name: - description: AWXBackup object name - type: string - 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: (Deprecated) Namespace the PVC is in - type: string - backup_dir: - description: Backup directory name, set as a status found on the awxbackup object (backupDirectory) - type: string - postgres_label_selector: - description: Label selector used to identify postgres pod for backing up data - type: string - postgres_image: - description: Registry path to the PostgreSQL container to use - type: string - postgres_image_version: - description: PostgreSQL container image version to use - type: string - no_log: - description: Configure no_log for no_log tasks - type: string - set_self_labels: - description: Maintain some of the recommended `app.kubernetes.io/*` labels on the resource (self) - type: boolean - default: true - status: - type: object - properties: - conditions: - description: The resulting conditions when a Service Telemetry is instantiated - items: - properties: - lastTransitionTime: - type: string - reason: - type: string - status: - type: string - type: - type: string - type: object - type: array - restoreComplete: - description: Restore process complete - type: boolean