diff --git a/tips/troubleshooting.md b/tips/troubleshooting.md index 103f7b9..60bbd51 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.5.3/docs/user-guide/advanced-configuration/containers-resource-requirements.md) for details. + - You can specify more specific value for each containers. Refer [official documentation](https://ansible.readthedocs.io/projects/awx-operator/en/latest/user-guide/advanced-configuration/containers-resource-requirements.html) 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/trust-custom-ca.md b/tips/trust-custom-ca.md index cb89ca8..2f23a25 100644 --- a/tips/trust-custom-ca.md +++ b/tips/trust-custom-ca.md @@ -154,7 +154,7 @@ First of all, you should ensure your CA certificate is mounted and has PEM forma bash-5.1$ openssl x509 -in /etc/openldap/certs/ldap-ca.crt -text # The secret bundle_cacert_secret is mounted as /etc/pki/ca-trust/source/anchors/bundle-ca.crt -bash-5.1$ openssl x509 -in /etc/pki/ca-trust/source/anchors/bundle-ca.crt +bash-5.1$ openssl x509 -in /etc/pki/ca-trust/source/anchors/bundle-ca.crt -text ``` Note that your certificate file should contain both intermediate CA and root CA, if your server certificate is signed by intermediate CA. @@ -178,7 +178,7 @@ Now you can test SSL connection. ```bash # This is an example to test connection to LDAP server over SSL using /etc/openldap/certs/ldap-ca.crt -bash-5.1$ openssl s_client -connect ldap.example.com:636 -no-CAfile -CAfile /etc/openldap/certs/ldap-ca.crt +bash-5.1$ echo | openssl s_client -connect ldap.example.com:636 -no-CAfile -CAfile /etc/openldap/certs/ldap-ca.crt CONNECTED(00000003) depth=2 C = JP, ST = Example State, O = EXAMPLE.COM, CN = rca.example.com verify return:1 diff --git a/tips/upgrade-operator.md b/tips/upgrade-operator.md index 4c5fbed..0b784e9 100644 --- a/tips/upgrade-operator.md +++ b/tips/upgrade-operator.md @@ -9,7 +9,7 @@ This guide provides the procedure for the following three types of upgrading AWX 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. +[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. ## Table of Contents diff --git a/tips/version-mapping.md b/tips/version-mapping.md index c2aea9f..8ae1c1e 100644 --- a/tips/version-mapping.md +++ b/tips/version-mapping.md @@ -59,7 +59,7 @@ The table below maps the AWX Operator versions and bundled AWX versions. | 0.7.0 | 18.0.0 | | 0.6.0 | 15.0.0 | -In the current version of AWX Operator, [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). +In the current version of AWX Operator, [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). ## Appendix: Gather bundled AWX version from AWX Operator