mirror of
https://github.com/Expand-sys/awx-on-k3s
synced 2025-12-16 05:52:15 +11:00
Merge pull request #267 from kurokobo/2.7.0
feat: bump operator version to 2.7.0
This commit is contained in:
commit
249af6f212
7 changed files with 11 additions and 21 deletions
14
README.md
14
README.md
|
|
@ -31,15 +31,15 @@ An example implementation of AWX on single node K3s using AWX Operator, with eas
|
|||
- CentOS Stream 8 (Minimal)
|
||||
- K3s v1.27.6+k3s1
|
||||
- Products that will be deployed:
|
||||
- AWX Operator 2.6.0
|
||||
- AWX 23.2.0
|
||||
- AWX Operator 2.7.0
|
||||
- AWX 23.3.0
|
||||
- PostgreSQL 13
|
||||
|
||||
## References
|
||||
|
||||
- [K3s - Lightweight Kubernetes](https://docs.k3s.io/)
|
||||
- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/23.2.0/INSTALL.md) @23.2.0
|
||||
- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.6.0/README.md) @2.6.0
|
||||
- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/23.3.0/INSTALL.md) @23.3.0
|
||||
- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.7.0/README.md) @2.7.0
|
||||
|
||||
## Requirements
|
||||
|
||||
|
|
@ -88,15 +88,11 @@ Clone this repository and change directory.
|
|||
|
||||
If you want to use files suitable for the specific version of AWX Operator, [refer tags in this repository](https://github.com/kurokobo/awx-on-k3s/tags) and specify desired tag in `git checkout`. Especially for `0.13.0` or earlier version of AWX Operator, refer to [📝Tips: Deploy older version of AWX Operator](tips/deploy-older-operator.md).
|
||||
|
||||
**⚠️Note for 2.6.0⚠️**
|
||||
|
||||
**I recommend to avoid using 2.6.0 because of bugs ([#1570](https://github.com/ansible/awx-operator/issues/1570), [#1572](https://github.com/ansible/awx-operator/issues/1572), and [#14486](https://github.com/ansible/awx/issues/14486)) that causes upgrading and backups to fail.**
|
||||
|
||||
```bash
|
||||
cd ~
|
||||
git clone https://github.com/kurokobo/awx-on-k3s.git
|
||||
cd awx-on-k3s
|
||||
git checkout 2.6.0
|
||||
git checkout 2.7.0
|
||||
```
|
||||
|
||||
Then invoke `kubectl apply -k operator` to deploy AWX Operator.
|
||||
|
|
|
|||
|
|
@ -7,10 +7,6 @@ This guide is specifically designed to use with the AWX which deployed using [th
|
|||
|
||||
You can also refer [the official instructions](https://github.com/ansible/awx-operator/tree/devel/roles/backup) for more information.
|
||||
|
||||
**⚠️Note for 2.6.0⚠️**
|
||||
|
||||
**I recommend to avoid using 2.6.0 because of bugs ([#1570](https://github.com/ansible/awx-operator/issues/1570) and [#1572](https://github.com/ansible/awx-operator/issues/1572)) that causes backups to fail.**
|
||||
|
||||
<!-- omit in toc -->
|
||||
## Table of Contents
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ An example simple playbook for Ansible is also provided in this repository. This
|
|||
| - | - | - |
|
||||
| `awxbackup_namespace` | The name of the NameSpace where the `AWXBackup` resource will be created. | `awx` |
|
||||
| `awxbackup_name` | The name of the `AWXBackup` resource. Dynamically generated using execution time by default. | `awxbackup-{{ lookup('pipe', 'date +%Y-%m-%d-%H-%M-%S') }}` |
|
||||
| `awxbackup_spec` | The `spec` of the `AWXBackup` resource. Refer [official documentation](https://github.com/ansible/awx-operator/tree/2.6.0/roles/backup) for acceptable fields. | `deployment_name: awx`<br>`backup_pvc: awx-backup-claim`<br>`clean_backup_on_delete: true` |
|
||||
| `awxbackup_spec` | The `spec` of the `AWXBackup` resource. Refer [official documentation](https://github.com/ansible/awx-operator/tree/2.7.0/roles/backup) for acceptable fields. | `deployment_name: awx`<br>`backup_pvc: awx-backup-claim`<br>`clean_backup_on_delete: true` |
|
||||
| `awxbackup_timeout` | Time to wait for backup to complete, in seconds. If exceeded, the playbook will fail. | `600` |
|
||||
| `awxbackup_keep_days` | Number of days to keep `AWXBackup` resources. `AWXBackup` resources older than this value will be deleted by this playbook. Set `0` to keep forever. | `30` |
|
||||
|
||||
|
|
|
|||
|
|
@ -2,10 +2,11 @@
|
|||
apiVersion: awx.ansible.com/v1beta1
|
||||
kind: AWXBackup
|
||||
metadata:
|
||||
name: awxbackup-2023-09-29
|
||||
name: awxbackup-2021-06-06
|
||||
namespace: awx
|
||||
spec:
|
||||
deployment_name: awx
|
||||
backup_pvc: awx-backup-claim
|
||||
|
||||
# Uncomment to reveal "censored" logs
|
||||
#no_log: false
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ secretGenerator:
|
|||
- operator=awx
|
||||
|
||||
resources:
|
||||
- github.com/ansible/awx-operator/config/default?ref=2.6.0
|
||||
- github.com/ansible/awx-operator/config/default?ref=2.7.0
|
||||
|
||||
images:
|
||||
- name: quay.io/ansible/awx-operator
|
||||
newTag: 2.6.0
|
||||
newTag: 2.7.0
|
||||
|
|
|
|||
|
|
@ -11,10 +11,6 @@ Note that once you upgrade AWX Operator, your AWX will also be upgraded automati
|
|||
|
||||
[There is `image_version` parameter for AWX resource to change which image will be used](https://ansible.readthedocs.io/projects/awx-operator/en/latest/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.html), but it appears that using a version of AWX other than the one bundled with the AWX Operator [is currently not supported](https://ansible.readthedocs.io/projects/awx-operator/en/latest/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.html). Conversely, if you want to upgrade AWX, you need to plan to upgrade AWX Operator first.
|
||||
|
||||
**⚠️Note for 2.6.0⚠️**
|
||||
|
||||
**I recommend to avoid using 2.6.0 because of bugs ([#14486](https://github.com/ansible/awx/issues/14486)) that causes upgrading to fail.**
|
||||
|
||||
<!-- omit in toc -->
|
||||
## Table of Contents
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ The table below maps the AWX Operator versions and bundled AWX versions.
|
|||
|
||||
| AWX Operator | AWX |
|
||||
| - | - |
|
||||
| 2.7.0 | 23.3.0 |
|
||||
| 2.6.0 | 23.2.0 |
|
||||
| 2.5.3 | 23.1.0 |
|
||||
| 2.5.2 | 23.0.0 |
|
||||
|
|
|
|||
Loading…
Reference in a new issue