From 9e44e21a66b374bf4c5247733226064e6c1f5540 Mon Sep 17 00:00:00 2001 From: "Christian M. Adams" Date: Wed, 24 Mar 2021 11:27:08 -0400 Subject: [PATCH] Rename pvc name var to be consistent with other backup variables --- deploy/crds/awx.ansible.com_v1beta1_backup_cr.yaml | 2 +- roles/backup/README.md | 4 ++-- roles/backup/templates/backup_pvc.yml.j2 | 4 ++-- roles/backup/vars/main.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deploy/crds/awx.ansible.com_v1beta1_backup_cr.yaml b/deploy/crds/awx.ansible.com_v1beta1_backup_cr.yaml index 505c0c9d..e026600b 100644 --- a/deploy/crds/awx.ansible.com_v1beta1_backup_cr.yaml +++ b/deploy/crds/awx.ansible.com_v1beta1_backup_cr.yaml @@ -6,5 +6,5 @@ metadata: spec: tower_backup_pvc: '' tower_backup_size: '' - tower_postgres_storage_class: '' + tower_backup_storage_class: '' tower_postgres_configuration_secret: '' diff --git a/roles/backup/README.md b/roles/backup/README.md index f5fe33a4..98f42547 100644 --- a/roles/backup/README.md +++ b/roles/backup/README.md @@ -30,7 +30,7 @@ metadata: namespace: my-namespace ``` -Finally, use `kubectl` to create the awx instance in your cluster: +Finally, use `kubectl` to create the backup object in your cluster: ```bash #> kubectl apply -f backup-awx.yml @@ -53,7 +53,7 @@ tower_backup_pvc: 'awx-backup-volume-claim' This role will automatically create a pvc using a Storage Class if provided: ``` -tower_postgres_storage_class: 'standard' +tower_backup_storage_class: 'standard' tower_backup_size: '20Gi' ``` diff --git a/roles/backup/templates/backup_pvc.yml.j2 b/roles/backup/templates/backup_pvc.yml.j2 index 3f918dda..6c997de8 100644 --- a/roles/backup/templates/backup_pvc.yml.j2 +++ b/roles/backup/templates/backup_pvc.yml.j2 @@ -7,8 +7,8 @@ metadata: spec: accessModes: - ReadWriteOnce -{% if tower_postgres_storage_class != '' %} - storageClassName: {{ tower_postgres_storage_class }} +{% if tower_backup_storage_class != '' %} + storageClassName: {{ tower_backup_storage_class }} {% endif %} resources: requests: diff --git a/roles/backup/vars/main.yml b/roles/backup/vars/main.yml index 5f653505..7ee44aa6 100644 --- a/roles/backup/vars/main.yml +++ b/roles/backup/vars/main.yml @@ -7,7 +7,7 @@ tower_backup_pvc: '' tower_backup_size: '' # Specify storage class to determine how to dynamically create PVC's with -tower_postgres_storage_class: '' +tower_backup_storage_class: '' # Secret to lookup that provide the PostgreSQL configuration tower_postgres_configuration_secret: ''