From df73fd664ffda3ce65734ca0e280303c9fd92bbb Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Tue, 26 May 2020 16:50:51 -0500 Subject: [PATCH] Issue #42: Add note about registry auth, drop redis requests. --- README.md | 6 ++++++ deploy/crds/tower_v1alpha1_tower_cr_awx.yaml | 2 -- deploy/crds/tower_v1alpha1_tower_cr_tower.yaml | 2 -- roles/tower/defaults/main.yml | 2 -- roles/tower/templates/tower_redis.yaml.j2 | 4 ---- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 06d05fa3..20a01b6c 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,12 @@ Then you can create instances of Tower, for example: After a few minutes, your new Tower instance will be accessible at `http://tower.mycompany.com/` (assuming your cluster has an Ingress controller configured). Log in using the `tower_admin_` credentials configured in the `spec`, and supply a valid license to begin using Tower. +### Red Hat Registry Authentication + +To deploy Ansible Tower, images are pulled from the Red Hat Registry. Your Kubernetes or OpenShift cluster will have to have [Authentication Enabled for the Red Hat Registry](https://access.redhat.com/documentation/en-us/openshift_container_platform/3.11/html/configuring_clusters/install-config-configuring-red-hat-registry) for this to work, otherwise the Tower image will not be pulled. + +If you deploy Ansible AWX, images are available from public registries, so no authentication is required. + ### Deploy AWX instead of Tower If you would like to deploy AWX (the open source upstream of Tower) into your cluster instead of Tower, override the default variables in the Tower `spec` for the `tower_task_image` and `tower_web_image`, so the AWX container images are used instead: diff --git a/deploy/crds/tower_v1alpha1_tower_cr_awx.yaml b/deploy/crds/tower_v1alpha1_tower_cr_awx.yaml index 40775eba..9c21484e 100644 --- a/deploy/crds/tower_v1alpha1_tower_cr_awx.yaml +++ b/deploy/crds/tower_v1alpha1_tower_cr_awx.yaml @@ -29,8 +29,6 @@ spec: tower_memcached_image: memcached:alpine tower_redis_image: redis:latest - tower_redis_mem_request: 1Gi - tower_redis_cpu_request: 500m tower_postgres_pass: awxpass tower_postgres_image: postgres:10 diff --git a/deploy/crds/tower_v1alpha1_tower_cr_tower.yaml b/deploy/crds/tower_v1alpha1_tower_cr_tower.yaml index 943a856d..9149854f 100644 --- a/deploy/crds/tower_v1alpha1_tower_cr_tower.yaml +++ b/deploy/crds/tower_v1alpha1_tower_cr_tower.yaml @@ -29,8 +29,6 @@ spec: tower_memcached_image: memcached:alpine tower_redis_image: redis:latest - tower_redis_mem_request: 1Gi - tower_redis_cpu_request: 500m tower_postgres_pass: awxpass tower_postgres_image: postgres:10 diff --git a/roles/tower/defaults/main.yml b/roles/tower/defaults/main.yml index 478b3f57..a21548c8 100644 --- a/roles/tower/defaults/main.yml +++ b/roles/tower/defaults/main.yml @@ -30,8 +30,6 @@ tower_web_cpu_request: 1000m tower_memcached_image: memcached:alpine tower_redis_image: redis:latest -tower_redis_mem_request: 1Gi -tower_redis_cpu_request: 500m tower_postgres_pass: awxpass tower_postgres_image: postgres:10 diff --git a/roles/tower/templates/tower_redis.yaml.j2 b/roles/tower/templates/tower_redis.yaml.j2 index f0aee393..5c2df139 100644 --- a/roles/tower/templates/tower_redis.yaml.j2 +++ b/roles/tower/templates/tower_redis.yaml.j2 @@ -22,10 +22,6 @@ spec: name: redis ports: - containerPort: 6379 - resources: - requests: - memory: "{{ tower_redis_mem_request }}" - cpu: "{{ tower_redis_cpu_request }}" # Redis Service. ---