diff --git a/deploy/awx-operator.yaml b/deploy/awx-operator.yaml index 92275636..3ef26181 100644 --- a/deploy/awx-operator.yaml +++ b/deploy/awx-operator.yaml @@ -122,7 +122,7 @@ spec: serviceAccountName: awx-operator containers: - name: awx-operator - image: "quay.io/shanemcd/awx-operator:0.7.1" + image: "quay.io/ansible/awx-operator:0.7.0" imagePullPolicy: "Always" volumeMounts: - mountPath: /tmp/ansible-operator/runner @@ -274,7 +274,6 @@ spec: type: string image: type: string - tower_image_pull_policy: description: The image pull policy type: string diff --git a/deploy/crds/awx_v1beta1_crd.yaml b/deploy/crds/awx_v1beta1_crd.yaml index 744164a6..77dc23c6 100644 --- a/deploy/crds/awx_v1beta1_crd.yaml +++ b/deploy/crds/awx_v1beta1_crd.yaml @@ -113,9 +113,16 @@ spec: tower_image: description: Registry path to the application container to use type: string - tower_ee_image: + tower_ee_images: description: Registry path to the Execution Environment container to use - type: string + type: array + items: + type: object + properties: + name: + type: string + image: + type: string tower_image_pull_policy: description: The image pull policy type: string diff --git a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml index b5eb091d..05b46ee7 100644 --- a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml @@ -4,28 +4,6 @@ metadata: annotations: alm-examples: |- [ - { - "apiVersion": "awx.ansible.com/v1beta1", - "kind": "AWX", - "metadata": { - "name": "example-awx", - "namespace": "example-awx" - }, - "spec": { - "tower_admin_email": "test@example.com", - "tower_admin_user": "test", - "tower_broadcast_websocket_secret": "changeme", - "tower_create_preload_data": true, - "tower_hostname": "example-awx.test", - "tower_image": "quay.io/ansible/awx:18.0.0", - "tower_ingress_type": "none", - "tower_ee_image": "quay.io/ansible/awx-ee:0.1.1", - "tower_memcached_image": "memcached:alpine", - "tower_postgres_storage_class": "", - "tower_redis_image": "redis:latest", - "tower_task_privileged": false - } - }, { "apiVersion": "awx.ansible.com/v1beta1", "kind": "AWX", @@ -36,8 +14,8 @@ metadata: "spec": { "deployment_type": "awx", "tower_admin_email": "test@example.com", - "tower_broadcast_websocket_secret": "changeme", "tower_create_preload_data": true, + "tower_ee_image": "quay.io/ansible/awx-ee:0.1.1", "tower_image": "quay.io/ansible/awx:18.0.0", "tower_ingress_type": "ingress", "tower_memcached_image": "memcached:alpine", @@ -71,8 +49,8 @@ spec: customresourcedefinitions: owned: - description: A AWX Instance - kind: AWX displayName: AWX + kind: AWX name: awxs.awx.ansible.com specDescriptors: - displayName: Hostname @@ -407,6 +385,12 @@ spec: - deployments/finalizers verbs: - update + - apiGroups: + - apps + resources: + - deployments/scale + verbs: + - patch - apiGroups: - "" resources: diff --git a/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml b/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml index 6a1a77d0..8735c97c 100644 --- a/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml +++ b/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml @@ -22,15 +22,16 @@ spec: ca_trust_bundle: description: Path where the trusted CA bundle is available type: string - ldap_cacert_secret: - description: Secret where can be found the LDAP trusted Certificate Authority Bundle - type: string deployment_type: description: Name of the deployment type type: string development_mode: description: If the deployment should be done in development mode type: boolean + ldap_cacert_secret: + description: Secret where can be found the LDAP trusted Certificate + Authority Bundle + type: string tower_admin_email: description: The admin user email type: string @@ -38,9 +39,9 @@ spec: description: Secret where the admin password can be found type: string tower_admin_user: + default: admin description: Username to use for the admin account type: string - default: admin tower_broadcast_websocket_secret: description: Secret where the broadcast websocket secret can be found type: string @@ -48,6 +49,17 @@ spec: default: true description: Whether or not to preload data upon Tower instance creation type: boolean + tower_ee_images: + description: Registry path to the Execution Environment container + to use + items: + properties: + image: + type: string + name: + type: string + type: object + type: array tower_extra_volumes: description: Specify extra volumes to add to the application pod type: string @@ -92,26 +104,27 @@ spec: tower_loadbalancer_annotations: description: Annotations to add to the loadbalancer type: string - tower_loadbalancer_protocol: - description: Protocol to use for the loadbalancer - type: string - default: http - enum: - - http - - https tower_loadbalancer_port: - description: Port to use for the loadbalancer - type: number default: 80 + description: Port to use for the loadbalancer + type: integer + tower_loadbalancer_protocol: + default: http + description: Protocol to use for the loadbalancer + enum: + - http + - https + type: string tower_node_selector: description: nodeSelector for the AWX pods type: string + tower_old_postgres_configuration_secret: + description: Secret where the old database configuration can be found + for data migration + type: string tower_postgres_configuration_secret: description: Secret where the database configuration can be found type: string - tower_old_postgres_configuration_secret: - description: Secret where the old database configuration can be found for data migration - type: string tower_postgres_data_path: description: Path where the PostgreSQL data are located type: string @@ -143,9 +156,6 @@ spec: tower_postgres_storage_class: description: Storage class to use for the PostgreSQL PVC type: string - tower_ee_image: - description: Registry path to the Execution Environment container to use - type: string tower_redis_image: description: Registry path to the redis container to use type: string @@ -185,9 +195,9 @@ spec: tower_task_extra_volume_mounts: type: string tower_task_privileged: + default: false description: If a privileged security context should be enabled type: boolean - default: false tower_task_resource_requirements: description: Resource requirements for the task container properties: @@ -274,6 +284,9 @@ spec: towerImage: description: URL of the image used for the deployed instance type: string + towerMigratedFromSecret: + description: The secret used for migrating an old Tower. + type: string towerURL: description: URL to access the deployed instance type: string