diff --git a/README.md b/README.md index 3f10bd04..ebd5ddda 100644 --- a/README.md +++ b/README.md @@ -62,11 +62,12 @@ If you deploy Ansible AWX, images are available from public registries, so no au ### 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: +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, and set the `deployment_type` to ``awx`: --- spec: ... + deployment_type: awx tower_task_image: ansible/awx_task:11.2.0 tower_web_image: ansible/awx_web:11.2.0 diff --git a/build/chain-operator-files.yml b/build/chain-operator-files.yml index b6e3a758..fb0d56d7 100644 --- a/build/chain-operator-files.yml +++ b/build/chain-operator-files.yml @@ -6,7 +6,7 @@ gather_facts: false vars: - operator_image: geerlingguy/tower-operator:0.4.0 + operator_image: ansible/tower-operator:0.4.0 pull_policy: Always operator_file_path: "../deploy/tower-operator.yaml" operator_template: "../deploy/operator.yaml" diff --git a/deploy/tower-operator.yaml b/deploy/tower-operator.yaml index c27d8f1b..62b1d055 100644 --- a/deploy/tower-operator.yaml +++ b/deploy/tower-operator.yaml @@ -159,3 +159,16 @@ spec: - name: v1beta1 served: true storage: true + validation: + openAPIV3Schema: + description: Schema validation for the Tower CRD + type: object + properties: + spec: + type: object + properties: + deployment_type: + type: string + pattern: "^(tower|awx)(-)?.*$" + required: + - deployment_type