From 65b1fcf40bbb09fb66de9e5463c00b0834e7dc3d Mon Sep 17 00:00:00 2001 From: kurokobo <2920259+kurokobo@users.noreply.github.com> Date: Thu, 11 May 2023 22:40:15 +0900 Subject: [PATCH] docs: correct minor issues --- README.md | 4 ++-- tips/README.md | 2 +- tips/upgrade-operator.md | 2 +- tips/version-mapping.md | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 8cb2405..f5f3bca 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ An example implementation of AWX on single node K3s using AWX Operator, with eas - Accessible over HTTPS from remote host - All data will be stored under `/data` - Fixed (configurable) passwords for AWX and PostgreSQL -- Fixed (configurable) versions of AWX and PostgreSQL +- Fixed (configurable) versions of AWX **If you want to view the guide for the specific version of AWX Operator, switch the page to the desired tag instead of the `main` branch.** @@ -296,7 +296,7 @@ Refer [📁 **Back up AWX using AWX Operator**](backup) and [📁 **Restore AWX - [📝Deploy older version of AWX Operator](tips/deploy-older-operator.md) - [📝Upgrade AWX Operator and AWX](tips/upgrade-operator.md) - [📝Workaround for the rate limit on Docker Hub](tips/dockerhub-rate-limit.md) - - [📝Version Mapping between AWX Operator and AWX](tips/version-mapping.md) + - [📝Version Mapping for AWX Operator and AWX](tips/version-mapping.md) - [📝Use Kerberos authentication to connect to Windows hosts](tips/use-kerberos.md) - [📝Use Helm or Operator Lifecycle Manager to manage AWX Operator and AWX](tips/alternative-methods.md) - [📝Troubleshooting Guide](tips/troubleshooting.md) diff --git a/tips/README.md b/tips/README.md index ee4d23c..4e6b459 100644 --- a/tips/README.md +++ b/tips/README.md @@ -10,7 +10,7 @@ - [📝Deploy older version of AWX Operator](deploy-older-operator.md) - [📝Upgrade AWX Operator and AWX](upgrade-operator.md) - [📝Workaround for the rate limit on Docker Hub](dockerhub-rate-limit.md) -- [📝Version Mapping between AWX Operator and AWX](version-mapping.md) +- [📝Version Mapping for AWX Operator and AWX](version-mapping.md) - [📝Use Kerberos authentication to connect to Windows hosts](use-kerberos.md) - [📝Use Helm or Operator Lifecycle Manager to manage AWX Operator and AWX](alternative-methods.md) - [📝Troubleshooting Guide](troubleshooting.md) diff --git a/tips/upgrade-operator.md b/tips/upgrade-operator.md index 547bc32..08a16c3 100644 --- a/tips/upgrade-operator.md +++ b/tips/upgrade-operator.md @@ -7,7 +7,7 @@ This guide provides the procedure for the following three types of upgrading AWX - Upgrade from `0.13.0` (e.g. from `0.13.0` to `0.14.0`) - Upgrade from `0.12.0` or earlier (e.g. from `0.12.0` to `0.13.0`) -Note that once you upgrade AWX Operator, your AWX will also be upgraded automatically to the version bundled with the upgraded AWX Operator as shown in [📝Version Mapping between AWX Operator and AWX](version-mapping.md). +Note that once you upgrade AWX Operator, your AWX will also be upgraded automatically to the version bundled with the upgraded AWX Operator as shown in [📝Version Mapping for AWX Operator and AWX](version-mapping.md). [There is `image_version` parameter for AWX resource to change which image will be used](https://github.com/ansible/awx-operator#deploying-a-specific-version-of-awx), but it appears that using a version of AWX other than the one bundled with the AWX Operator [is currently not supported](https://github.com/ansible/awx-operator#deploying-a-specific-version-of-awx). Conversely, if you want to upgrade AWX, you need to plan to upgrade AWX Operator first. diff --git a/tips/version-mapping.md b/tips/version-mapping.md index 7835a66..f06e400 100644 --- a/tips/version-mapping.md +++ b/tips/version-mapping.md @@ -1,10 +1,10 @@ -# Version Mapping between AWX Operator and AWX +# Version Mapping for AWX Operator and AWX -- [Default version mapping between AWX Operator and AWX](#default-version-mapping-between-awx-operator-and-awx) +- [Default version mapping for AWX Operator and AWX](#default-version-mapping-for-awx-operator-and-awx) - [Appendix: Gather bundled AWX version from AWX Operator](#appendix-gather-bundled-awx-version-from-awx-operator) -## Default version mapping between AWX Operator and AWX +## Default version mapping for AWX Operator and AWX The table below maps the AWX Operator versions and bundled AWX versions.