From 34cf9c980a851f1816a9304793a8b7c2bb2332e8 Mon Sep 17 00:00:00 2001 From: zaki-lknr Date: Mon, 18 Mar 2024 22:02:04 +0900 Subject: [PATCH 1/3] docs: add description of init container image definition --- .../deploying-a-specific-version-of-awx.md | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md b/docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md index 4f81b5c4d..ec1f72955 100644 --- a/docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md +++ b/docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md @@ -2,15 +2,17 @@ There are a few variables that are customizable for awx the image management. -| Name | Description | Default | -| ------------------- | ------------------------- | ----------------------------------------- | -| image | Path of the image to pull | quay.io/ansible/awx | -| image_version | Image version to pull | value of DEFAULT_AWX_VERSION or latest | -| image_pull_policy | The pull policy to adopt | IfNotPresent | -| image_pull_secrets | The pull secrets to use | None | -| ee_images | A list of EEs to register | quay.io/ansible/awx-ee:DEFAULT_AWX_VERSION | -| redis_image | Path of the image to pull | docker.io/redis | -| redis_image_version | Image version to pull | latest | +| Name | Description | Default | +| ---------------------------- | ------------------------- | ------------------------------------------ | +| image | Path of the image to pull | quay.io/ansible/awx | +| image_version | Image version to pull | value of DEFAULT_AWX_VERSION or latest | +| image_pull_policy | The pull policy to adopt | IfNotPresent | +| image_pull_secrets | The pull secrets to use | None | +| ee_images | A list of EEs to register | quay.io/ansible/awx-ee:DEFAULT_AWX_VERSION | +| redis_image | Path of the image to pull | docker.io/redis | +| redis_image_version | Image version to pull | latest | +| init_container_image | Path of the image to pull | quay.io/ansible/awx-ee | +| init_container_image_version | Image version to pull | value of DEFAULT_AWX_VERSION or latest | Example of customization could be: @@ -26,6 +28,7 @@ spec: ee_images: - name: my-custom-awx-ee image: myorg/my-custom-awx-ee + init_container_image: myorg/my-custom-awx-ee ``` **Note**: The `image` and `image_version` are intended for local mirroring scenarios. Please note that using a version of AWX other than the one bundled with the `awx-operator` is **not** supported. For the default values, check the [main.yml](https://github.com/ansible/awx-operator/blob/devel/roles/installer/defaults/main.yml) file. From a9f2b86c9306421e9cc3e27e5234902b288ab85e Mon Sep 17 00:00:00 2001 From: zaki-lknr Date: Wed, 20 Mar 2024 10:47:45 +0900 Subject: [PATCH 2/3] Update docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md Co-authored-by: kurokobo --- .../deploying-a-specific-version-of-awx.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md b/docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md index ec1f72955..b3921ccbc 100644 --- a/docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md +++ b/docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md @@ -28,7 +28,10 @@ spec: ee_images: - name: my-custom-awx-ee image: myorg/my-custom-awx-ee + control_plane_ee_image: myorg/my-custom-awx-ee:latest init_container_image: myorg/my-custom-awx-ee + init_container_image_version: latest + init_projects_container_image: myorg/my-mirrored-centos:stream9 ``` **Note**: The `image` and `image_version` are intended for local mirroring scenarios. Please note that using a version of AWX other than the one bundled with the `awx-operator` is **not** supported. For the default values, check the [main.yml](https://github.com/ansible/awx-operator/blob/devel/roles/installer/defaults/main.yml) file. From 066111937e5497a19aa819eb763181eb99af6df2 Mon Sep 17 00:00:00 2001 From: zaki-lknr Date: Wed, 20 Mar 2024 10:48:51 +0900 Subject: [PATCH 3/3] Update docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md Co-authored-by: kurokobo --- .../deploying-a-specific-version-of-awx.md | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md b/docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md index b3921ccbc..91e60d69f 100644 --- a/docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md +++ b/docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md @@ -2,17 +2,19 @@ There are a few variables that are customizable for awx the image management. -| Name | Description | Default | -| ---------------------------- | ------------------------- | ------------------------------------------ | -| image | Path of the image to pull | quay.io/ansible/awx | -| image_version | Image version to pull | value of DEFAULT_AWX_VERSION or latest | -| image_pull_policy | The pull policy to adopt | IfNotPresent | -| image_pull_secrets | The pull secrets to use | None | -| ee_images | A list of EEs to register | quay.io/ansible/awx-ee:DEFAULT_AWX_VERSION | -| redis_image | Path of the image to pull | docker.io/redis | -| redis_image_version | Image version to pull | latest | -| init_container_image | Path of the image to pull | quay.io/ansible/awx-ee | -| init_container_image_version | Image version to pull | value of DEFAULT_AWX_VERSION or latest | +| Name | Description | Default | +| ----------------------------- | ------------------------- | ------------------------------------------ | +| image | Path of the image to pull | quay.io/ansible/awx | +| image_version | Image version to pull | value of DEFAULT_AWX_VERSION or latest | +| image_pull_policy | The pull policy to adopt | IfNotPresent | +| image_pull_secrets | The pull secrets to use | None | +| ee_images | A list of EEs to register | quay.io/ansible/awx-ee:DEFAULT_AWX_VERSION | +| redis_image | Path of the image to pull | docker.io/redis | +| redis_image_version | Image version to pull | latest | +| control_plane_ee_image | Image version to pull | quay.io/ansible/awx-ee:DEFAULT_AWX_VERSION | +| init_container_image | Path of the image to pull | quay.io/ansible/awx-ee | +| init_container_image_version | Image version to pull | value of DEFAULT_AWX_VERSION or latest | +| init_projects_container_image | Image version to pull | quay.io/centos/centos:stream9 | Example of customization could be: