mirror of
https://github.com/Expand-sys/awx-on-k3s
synced 2025-12-16 05:52:15 +11:00
Merge pull request #256 from kurokobo/awx-2.5.2
feat: bump operator version to 2.5.2
This commit is contained in:
commit
3b5e25b32a
9 changed files with 18 additions and 17 deletions
10
README.md
10
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.4+k3s1
|
||||
- Products that will be deployed:
|
||||
- AWX Operator 2.5.1
|
||||
- AWX 22.7.0
|
||||
- AWX Operator 2.5.2
|
||||
- AWX 23.0.0
|
||||
- PostgreSQL 13
|
||||
|
||||
## References
|
||||
|
||||
- [K3s - Lightweight Kubernetes](https://docs.k3s.io/)
|
||||
- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/22.7.0/INSTALL.md) @22.7.0
|
||||
- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.5.1/README.md) @2.5.1
|
||||
- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/23.0.0/INSTALL.md) @23.0.0
|
||||
- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.5.2/README.md) @2.5.2
|
||||
|
||||
## Requirements
|
||||
|
||||
|
|
@ -92,7 +92,7 @@ If you want to use files suitable for the specific version of AWX Operator, [ref
|
|||
cd ~
|
||||
git clone https://github.com/kurokobo/awx-on-k3s.git
|
||||
cd awx-on-k3s
|
||||
git checkout 2.5.1
|
||||
git checkout 2.5.2
|
||||
```
|
||||
|
||||
Then invoke `kubectl apply -k operator` to deploy AWX Operator.
|
||||
|
|
|
|||
|
|
@ -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.5.1/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.5.2/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` |
|
||||
|
||||
|
|
|
|||
|
|
@ -189,7 +189,7 @@ There is a Kubernetes Operator for Pulp 3 named Pulp Operator.
|
|||
|
||||
- [pulp/pulp-operator: Kubernetes Operator for Pulp 3](https://github.com/pulp/pulp-operator)
|
||||
|
||||
This project is in alpha stage and under active development. In this guide, we use [Pulp Operator 1.0.0-alpha.8](https://github.com/pulp/pulp-operator/tree/1.0.0-alpha.8).
|
||||
This project is in alpha stage and under active development. In this guide, we use [Pulp Operator 1.0.0-alpha.9](https://github.com/pulp/pulp-operator/tree/1.0.0-alpha.9).
|
||||
|
||||
### Install Pulp Operator
|
||||
|
||||
|
|
@ -199,7 +199,7 @@ Install specified version of Pulp Operator.
|
|||
cd ~
|
||||
git clone https://github.com/pulp/pulp-operator.git
|
||||
cd pulp-operator
|
||||
git checkout 1.0.0-alpha.8
|
||||
git checkout 1.0.0-alpha.9
|
||||
```
|
||||
|
||||
Export the name of the namespace where you want to deploy Pulp Operator as the environment variable `NAMESPACE` and run `make deploy`. The default namespace is `pulp-operator-system`. Note that `make deploy` requires `go` binary by default but you can remove this dependency by small `sed` patch.
|
||||
|
|
@ -308,8 +308,8 @@ When the deployment completes successfully, the logs end with:
|
|||
```txt
|
||||
$ kubectl -n galaxy logs -f deployments/pulp-operator-controller-manager
|
||||
...
|
||||
2006-01-02T15:04:05Z INFO repo_manager/status.go:146 galaxy operator finished execution ...
|
||||
2006-01-02T15:04:05Z INFO repo_manager/controller.go:339 Operator tasks synced
|
||||
2006-01-02T15:04:05Z INFO repo_manager/status.go:149 galaxy operator finished execution ...
|
||||
2006-01-02T15:04:05Z INFO repo_manager/controller.go:233 Operator tasks synced
|
||||
```
|
||||
|
||||
Required objects has been deployed next to Pulp Operator in `galaxy` namespace.
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ metadata:
|
|||
name: galaxy
|
||||
spec:
|
||||
# These parameters are designed for use with:
|
||||
# - Pulp Operator: 1.0.0-alpha.8
|
||||
# https://github.com/pulp/pulp-operator/blob/1.0.0-alpha.8/README.md
|
||||
# - Pulp Operator: 1.0.0-alpha.9
|
||||
# https://github.com/pulp/pulp-operator/blob/1.0.0-alpha.9/README.md
|
||||
# - Galaxy NG: 4.7.1
|
||||
# https://github.com/ansible/galaxy_ng/tree/4.7.1
|
||||
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ secretGenerator:
|
|||
- operator=awx
|
||||
|
||||
resources:
|
||||
- github.com/ansible/awx-operator/config/default?ref=2.5.1
|
||||
- github.com/ansible/awx-operator/config/default?ref=2.5.2
|
||||
|
||||
images:
|
||||
- name: quay.io/ansible/awx-operator
|
||||
newTag: 2.5.1
|
||||
newTag: 2.5.2
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ This repository includes ready-to-use files as an example to run Ansible Runner.
|
|||
- CentOS Stream 8 (Minimal)
|
||||
- Python 3.9
|
||||
- Docker 20.10.17
|
||||
- Ansible Runner 2.3.3
|
||||
- Ansible Runner 2.3.4
|
||||
|
||||
## Install
|
||||
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ Typical solutions are one of the following:
|
|||
ee_resource_requirements: {} 👈👈👈
|
||||
```
|
||||
|
||||
- You can specify more specific value for each containers. Refer [official documentation](https://github.com/ansible/awx-operator/blob/2.5.1/README.md#containers-resource-requirements) for details.
|
||||
- You can specify more specific value for each containers. Refer [official documentation](https://github.com/ansible/awx-operator/blob/2.5.2/docs/user-guide/advanced-configuration/containers-resource-requirements.md) for details.
|
||||
- In this way you can run AWX with fewer resources, but you may encounter performance issues.
|
||||
|
||||
### The Pod is `Pending` with "1 pod has unbound immediate PersistentVolumeClaims." event
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ sudo rm -rf /data/postgres
|
|||
|
||||
## 📝 Upgrade from `0.13.0` (e.g. from `0.13.0` to `0.14.0`)
|
||||
|
||||
If you are using AWX Operator `0.13.0` and want to upgrade to newer version, you should consider the big changes in AWX Operator in `0.14.0`. [As described in the documentation](https://github.com/ansible/awx-operator/blob/0.14.0/README.md#v0140), in `0.14.0`, AWX Operator changed from cluster scope to namespace scope. Also, the Operator SDK `1.x` is used.
|
||||
If you are using AWX Operator `0.13.0` and want to upgrade to newer version, you should consider the big changes in AWX Operator in `0.14.0`. [As described in the documentation](https://github.com/ansible/awx-operator/blob/2.5.2/docs/upgrade/upgrading.md#v0140), in `0.14.0`, AWX Operator changed from cluster scope to namespace scope. Also, the Operator SDK `1.x` is used.
|
||||
|
||||
This means that upgrading from `0.13.0` to `0.14.0` or later requires a bit of finesse, such as cleaning the old AWX Operator. **If you are using `0.12.0` or earlier and want to upgrade to `0.14.0` or later, I recommend you to [upgrade to `0.13.0` first](#-upgrade-from-0120-or-earlier-eg-from-0120-to-0130) and then come back to here to avoid unintended issue.**
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ The table below maps the AWX Operator versions and bundled AWX versions.
|
|||
|
||||
| AWX Operator | AWX |
|
||||
| - | - |
|
||||
| 2.5.2 | 23.0.0 |
|
||||
| 2.5.1 | 22.7.0 |
|
||||
| 2.5.0 | 22.6.0 |
|
||||
| 2.4.0 | 22.5.0 |
|
||||
|
|
|
|||
Loading…
Reference in a new issue