diff --git a/README.md b/README.md index f5f3bca..be41b56 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.26.4+k3s1 + - K3s v1.26.5+k3s1 - Products that will be deployed: - - AWX Operator 2.2.1 - - AWX 22.3.0 + - AWX Operator 2.3.0 + - AWX 22.4.0 - PostgreSQL 13 ## References - [K3s - Lightweight Kubernetes](https://docs.k3s.io/) -- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/22.3.0/INSTALL.md) @22.3.0 -- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.2.1/README.md) @2.2.1 +- [INSTALL.md on ansible/awx](https://github.com/ansible/awx/blob/22.4.0/INSTALL.md) @22.4.0 +- [README.md on ansible/awx-operator](https://github.com/ansible/awx-operator/blob/2.3.0/README.md) @2.3.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 2.2.1 +git checkout 2.3.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 2.2.1 +git checkout 2.3.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/acme/README.md b/acme/README.md index 0f2adb6..a9dad78 100644 --- a/acme/README.md +++ b/acme/README.md @@ -42,7 +42,7 @@ This guide does not provide any information how to configure Azure, other DNS se Deploy cert-manager first. ```bash -kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.11.2/cert-manager.yaml +kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.12.2/cert-manager.yaml ``` Ensure the pods in `cert-manager` namespace are running. diff --git a/backup/ansible/README.md b/backup/ansible/README.md index 90c55d0..3277af3 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/2.2.1/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/2.3.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 a0d747e..482eafd 100644 --- a/base/awx.yaml +++ b/base/awx.yaml @@ -35,6 +35,7 @@ spec: web_resource_requirements: {} task_resource_requirements: {} ee_resource_requirements: {} + init_container_resource_requirements: {} # Uncomment to reveal "censored" logs #no_log: false diff --git a/galaxy/README.md b/galaxy/README.md index 2052d3e..00e36df 100644 --- a/galaxy/README.md +++ b/galaxy/README.md @@ -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.7](https://github.com/pulp/pulp-operator/tree/1.0.0-alpha.7). +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). ### 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.7 +git checkout 1.0.0-alpha.8 ``` 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. @@ -355,8 +355,8 @@ replicaset.apps/galaxy-web-546fbf459 1 1 NAME READY AGE statefulset.apps/galaxy-database 1/1 3m22s -NAME CLASS HOSTS ADDRESS PORTS AGE -ingress.networking.k8s.io/galaxy galaxy.example.com 192.168.0.219 80, 443 2m45s +NAME CLASS HOSTS ADDRESS PORTS AGE +ingress.networking.k8s.io/galaxy traefik galaxy.example.com 192.168.0.219 80, 443 2m45s NAME TYPE DATA AGE secret/galaxy-admin-password Opaque 1 3m22s diff --git a/galaxy/pulp/galaxy.yaml b/galaxy/pulp/galaxy.yaml index 5f1a8b4..55cdaec 100644 --- a/galaxy/pulp/galaxy.yaml +++ b/galaxy/pulp/galaxy.yaml @@ -4,8 +4,8 @@ metadata: name: galaxy spec: # These parameters are designed for use with: - # - Pulp Operator: 1.0.0-alpha.7 - # https://github.com/pulp/pulp-operator/blob/1.0.0-alpha.7/README.md + # - Pulp Operator: 1.0.0-alpha.8 + # https://github.com/pulp/pulp-operator/blob/1.0.0-alpha.8/README.md # - Galaxy NG: 4.7.1 # https://github.com/ansible/galaxy_ng/tree/4.7.1 diff --git a/runner/README.md b/runner/README.md index 6b3905c..3f2ad9b 100644 --- a/runner/README.md +++ b/runner/README.md @@ -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.2 +- Ansible Runner 2.3.3 ## Install diff --git a/tips/troubleshooting.md b/tips/troubleshooting.md index 7c79dd1..f2085d0 100644 --- a/tips/troubleshooting.md +++ b/tips/troubleshooting.md @@ -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.2.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.3.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 f06e400..265dd65 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 | | - | - | +| 2.3.0 | 22.4.0 | | 2.2.1 | 22.3.0 | | 2.2.0 | 22.3.0 | | 2.1.0 | 22.2.0 |