From e824fade85e59d3afcac7d70d09596f01df1b801 Mon Sep 17 00:00:00 2001 From: kurokobo <2920259+kurokobo@users.noreply.github.com> Date: Wed, 29 Mar 2023 10:27:22 +0900 Subject: [PATCH] feat: bump operator version to 1.4.0 --- README.md | 14 +++++++------- backup/ansible/README.md | 2 +- base/awx.yaml | 8 ++++---- git/README.md | 1 + git/kustomization.yaml | 2 +- tips/troubleshooting.md | 2 +- tips/version-mapping.md | 1 + 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 66d0b65..a4e6471 100644 --- a/README.md +++ b/README.md @@ -29,17 +29,17 @@ An example implementation of AWX on single node K3s using AWX Operator, with eas - Tested on: - CentOS Stream 8 (Minimal) - - K3s v1.25.6+k3s1 + - K3s v1.25.7+k3s1 - Products that will be deployed: - - AWX Operator 1.3.0 - - AWX 21.13.0 + - AWX Operator 1.4.0 + - AWX 21.14.0 - PostgreSQL 13 ## References - [K3s - Lightweight Kubernetes](https://docs.k3s.io/) -- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/21.13.0/INSTALL.md) @21.13.0 -- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/1.3.0/README.md) @1.3.0 +- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/21.14.0/INSTALL.md) @21.14.0 +- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/1.4.0/README.md) @1.4.0 ## Requirements @@ -90,7 +90,7 @@ Install specified version of AWX Operator. Note that this procedure is applicabl cd ~ git clone https://github.com/ansible/awx-operator.git cd awx-operator -git checkout 1.3.0 +git checkout 1.4.0 ``` Export the name of the namespace where you want to deploy AWX Operator as the environment variable `NAMESPACE` and run `make deploy`. The default namespace is `awx`. @@ -127,7 +127,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 1.3.0 +git checkout 1.4.0 ``` Generate a Self-Signed certificate. Note that IP address can't be specified. If you want to use a certificate from public ACME CA such as Let's Encrypt or ZeroSSL instead of Self-Signed certificate, follow the guide on [📁 **Use SSL Certificate from Public ACME CA**](acme) first and come back to this step when done. diff --git a/backup/ansible/README.md b/backup/ansible/README.md index dcec4c0..f8cdce5 100644 --- a/backup/ansible/README.md +++ b/backup/ansible/README.md @@ -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/1.3.0/roles/backup) for acceptable fields. | `deployment_name: awx`
`backup_pvc: awx-backup-claim`
`clean_backup_on_delete: true` | +| `awxbackup_spec` | The `spec` of the `AWXBackup` resource. Refer [official documentation](https://github.com/ansible/awx-operator/tree/1.4.0/roles/backup) for acceptable fields. | `deployment_name: awx`
`backup_pvc: awx-backup-claim`
`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` | diff --git a/base/awx.yaml b/base/awx.yaml index 94c3e5d..8d6b52f 100644 --- a/base/awx.yaml +++ b/base/awx.yaml @@ -5,10 +5,10 @@ metadata: name: awx spec: # These parameters are designed for use with: - # - AWX Operator: 1.3.0 - # https://github.com/ansible/awx-operator/blob/1.3.0/README.md - # - AWX: 21.13.0 - # https://github.com/ansible/awx/blob/21.13.0/INSTALL.md + # - AWX Operator: 1.4.0 + # https://github.com/ansible/awx-operator/blob/1.4.0/README.md + # - AWX: 21.14.0 + # https://github.com/ansible/awx/blob/21.14.0/INSTALL.md admin_user: admin admin_password_secret: awx-admin-password diff --git a/git/README.md b/git/README.md index 4893e26..9d1e6ad 100644 --- a/git/README.md +++ b/git/README.md @@ -77,6 +77,7 @@ Note that this sample manifest does not include any databases, so the SQLite3 ha | Configuration | Recommended Value | | -------------- | -------------------------------------------------------- | | Database Type | `SQLite3` | +| Server Domain | `git.example.com` or the hostname you specified | | Gitea Base URL | `https://git.example.com/` or the hostname you specified | ## Configure AWX to use Git Repository with Self-Signed Certificate diff --git a/git/kustomization.yaml b/git/kustomization.yaml index a241e3e..fbbdb05 100644 --- a/git/kustomization.yaml +++ b/git/kustomization.yaml @@ -15,7 +15,7 @@ secretGenerator: images: - name: gitea/gitea - newTag: "1.18" + newTag: "1.19" resources: - namespace.yaml diff --git a/tips/troubleshooting.md b/tips/troubleshooting.md index 68a47f5..0b8ffac 100644 --- a/tips/troubleshooting.md +++ b/tips/troubleshooting.md @@ -182,7 +182,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/1.3.0/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/1.4.0/README.md#containers-resource-requirements) 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 diff --git a/tips/version-mapping.md b/tips/version-mapping.md index 8a3386a..4c61b42 100644 --- a/tips/version-mapping.md +++ b/tips/version-mapping.md @@ -10,6 +10,7 @@ The table below maps the AWX Operator versions and bundled AWX versions. | AWX Operator | AWX | | - | - | +| 1.4.0 | 21.14.0 | | 1.3.0 | 21.13.0 | | 1.2.0 | 21.12.0 | | 1.1.4 | 21.11.0 |