From 6347ceb976ab5def84cac7fb3c6f112fbada7c78 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Wed, 2 Jun 2021 16:42:45 -0400 Subject: [PATCH] Update OLM metadata --- bundle.Dockerfile | 2 +- .../awx-operator.clusterserviceversion.yaml | 75 +++---- .../awx.ansible.com_awxbackups_crd.yaml | 4 +- .../awx.ansible.com_awxrestores_crd.yaml | 12 +- .../manifests/awx.ansible.com_awxs_crd.yaml | 185 ++++++++++-------- 5 files changed, 152 insertions(+), 126 deletions(-) diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 17fe97cd..f78084ba 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -6,9 +6,9 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=awx-operator LABEL operators.operatorframework.io.bundle.channels.v1=alpha LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha -LABEL operators.operatorframework.io.metrics.project_layout=ansible LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v0.19.4 +LABEL operators.operatorframework.io.metrics.project_layout=ansible COPY deploy/olm-catalog/awx-operator/manifests /manifests/ COPY deploy/olm-catalog/awx-operator/metadata /metadata/ 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 721b5653..351ad8b2 100644 --- a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml @@ -14,6 +14,7 @@ metadata: "spec": { "deployment_type": "awx", "ingress_type": "ingress", + "service_account_annotations": "foo: bar\n", "task_resource_requirements": { "requests": { "cpu": "500m", @@ -38,10 +39,9 @@ spec: apiservicedefinitions: {} customresourcedefinitions: owned: - - kind: AWXBackup + - displayName: AWX Backup + kind: AWXBackup name: awxbackups.awx.ansible.com - version: v1beta1 - displayName: AWX Backup specDescriptors: - displayName: Deployment name path: deployment_name @@ -73,26 +73,26 @@ spec: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:hidden statusDescriptors: - - displayName: Backup claim - description: The persistent volume claim name used during backup + - description: The persistent volume claim name used during backup + displayName: Backup claim path: backupClaim x-descriptors: - urn:alm:descriptor:com.tectonic.ui:text - - displayName: Backup directory - description: The directory data is backed up to on the PVC + - description: The directory data is backed up to on the PVC + displayName: Backup directory path: backupDirectory x-descriptors: - urn:alm:descriptor:com.tectonic.ui:text - - kind: AWXRestore - name: awxrestores.awx.ansible.com version: v1beta1 - displayName: AWX Restore + - displayName: AWX Restore + kind: AWXRestore + name: awxrestores.awx.ansible.com specDescriptors: - displayName: Backup source to restore ? path: backup_source x-descriptors: - - urn:alm:descriptor:com.tectonic.ui:select:CR - - urn:alm:descriptor:com.tectonic.ui:select:PVC + - urn:alm:descriptor:com.tectonic.ui:select:CR + - urn:alm:descriptor:com.tectonic.ui:select:PVC - displayName: Backup name path: backup_name x-descriptors: @@ -123,11 +123,12 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:hidden statusDescriptors: - - displayName: Restore status - description: The state of the restore + - description: The state of the restore + displayName: Restore status path: restoreComplete x-descriptors: - urn:alm:descriptor:com.tectonic.ui:text + version: v1beta1 - description: A AWX Instance displayName: AWX kind: AWX @@ -262,12 +263,14 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:resourceRequirements - - displayName: PostgreSQL container resource requirements (when using a managed instance) + - displayName: PostgreSQL container resource requirements (when using a managed + instance) path: postgres_resource_requirements x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:resourceRequirements - - displayName: PostgreSQL container storage requirements (when using a managed instance) + - displayName: PostgreSQL container storage requirements (when using a managed + instance) path: postgres_storage_requirements x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced @@ -397,8 +400,8 @@ spec: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:fieldDependency:projects_use_existing_claim:_Yes_ - urn:alm:descriptor:io.kubernetes:PersistentVolumeClaim - - description: Projects Storage Class Name. If not present, the default - storage class will be used. + - description: Projects Storage Class Name. If not present, the default storage + class will be used. displayName: Projects Storage Class Name path: projects_storage_class x-descriptors: @@ -424,26 +427,26 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:hidden - - displayName: Task Extra Env - description: Environment variables to be added to Task container + - description: Environment variables to be added to Task container + displayName: Task Extra Env path: task_extra_env x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:hidden - - displayName: EE Extra Volume Mounts + - description: Specify volume mounts to be added to Execution container + displayName: EE Extra Volume Mounts path: ee_extra_volume_mounts - description: Specify volume mounts to be added to Execution container x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:hidden - - displayName: EE Images - description: Registry path to the Execution Environment container to use + - description: Registry path to the Execution Environment container to use + displayName: EE Images path: ee_images x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:hidden - - displayName: Task Extra Volume Mounts - description: Specify volume mounts to be added to Task container + - description: Specify volume mounts to be added to Task container + displayName: Task Extra Volume Mounts path: task_extra_volume_mounts x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced @@ -458,20 +461,20 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:hidden - - displayName: Web Extra Env - description: Environment variables to be added to Web container + - description: Environment variables to be added to Web container + displayName: Web Extra Env path: web_extra_env x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:hidden - - displayName: Web Extra Volume Mounts - description: Specify volume mounts to be added to Web container + - description: Specify volume mounts to be added to Web container + displayName: Web Extra Volume Mounts path: web_extra_volume_mounts x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:hidden - - displayName: Extra Volumes - description: Specify extra volumes to add to the application pod + - description: Specify extra volumes to add to the application pod + displayName: Extra Volumes path: extra_volumes x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced @@ -607,6 +610,8 @@ spec: - awx.ansible.com resources: - '*' + - awxbackups + - awxrestores verbs: - '*' serviceAccountName: awx-operator @@ -637,7 +642,11 @@ spec: value: awx-operator - name: ANSIBLE_GATHERING value: explicit - image: quay.io/ansible/awx-operator:0.8.0 + - name: OPERATOR_VERSION + value: 0.10.0 + - name: ANSIBLE_DEBUG_LOGS + value: "false" + image: quay.io/ansible/awx-operator:0.10.0 imagePullPolicy: Always livenessProbe: httpGet: diff --git a/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxbackups_crd.yaml b/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxbackups_crd.yaml index 47ff3b31..5636c263 100644 --- a/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxbackups_crd.yaml +++ b/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxbackups_crd.yaml @@ -18,8 +18,6 @@ spec: description: Schema validation for the AWXBackup CRD properties: spec: - required: - - deployment_name properties: backup_pvc: description: Name of the PVC to be used for storing the backup @@ -40,6 +38,8 @@ spec: description: Label selector used to identify postgres pod for backing up data type: string + required: + - deployment_name type: object type: object x-kubernetes-preserve-unknown-fields: true diff --git a/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxrestores_crd.yaml b/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxrestores_crd.yaml index b09fe42d..0d9ccded 100644 --- a/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxrestores_crd.yaml +++ b/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxrestores_crd.yaml @@ -19,12 +19,6 @@ spec: properties: spec: properties: - backup_source: - description: Backup source - type: string - enum: - - CR - - PVC backup_dir: description: Backup directory name, set as a status found on the awxbackup object (backupDirectory) @@ -39,6 +33,12 @@ spec: backup_pvc_namespace: description: Namespace the PVC is in type: string + backup_source: + description: Backup source + enum: + - CR + - PVC + type: string deployment_name: description: Name of the deployment to be restored to type: string 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 575af6fe..fededf3f 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 @@ -19,28 +19,6 @@ spec: properties: spec: properties: - ca_trust_bundle: - description: Path where the trusted CA bundle is available - type: string - deployment_type: - description: Name of the deployment type - type: string - default: awx - kind: - description: Kind of the deployment type - type: string - default: AWX - api_version: - description: apiVersion of the deployment type - type: string - default: awx.ansible.com/v1beta1 - 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 admin_email: description: The admin user email type: string @@ -51,13 +29,30 @@ spec: default: admin description: Username to use for the admin account type: string + api_version: + default: awx.ansible.com/v1beta1 + description: apiVersion of the deployment type + type: string broadcast_websocket_secret: description: Secret where the broadcast websocket secret can be found type: string + ca_trust_bundle: + description: Path where the trusted CA bundle is available + type: string create_preload_data: default: true description: Whether or not to preload data upon instance creation type: boolean + deployment_type: + default: awx + description: Name of the deployment type + type: string + development_mode: + description: If the deployment should be done in development mode + type: boolean + ee_extra_volume_mounts: + description: Specify volume mounts to be added to Execution container + type: string ee_images: description: Registry path to the Execution Environment container to use @@ -69,6 +64,16 @@ spec: type: string type: object type: array + extra_settings: + description: Extra settings to specify for the API + items: + properties: + setting: + type: string + value: + type: string + type: object + type: array extra_volumes: description: Specify extra volumes to add to the application pod type: string @@ -82,9 +87,6 @@ spec: image: description: Registry path to the application container to use type: string - image_version: - description: Application container image version to use - type: string image_pull_policy: default: IfNotPresent description: The image pull policy @@ -99,11 +101,14 @@ spec: image_pull_secret: description: The image pull secret type: string + image_version: + description: Application container image version to use + type: string ingress_annotations: - description: Annotations to add to the ingress + description: Annotations to add to the Ingress Controller type: string ingress_tls_secret: - description: Secret where the ingress TLS secret can be found + description: Secret where the Ingress TLS secret can be found type: string ingress_type: description: The ingress type to use to reach the deployed instance @@ -113,10 +118,14 @@ spec: - ingress - Route - route - - LoadBalancer - - loadbalancer - - NodePort - - nodeport + type: string + kind: + default: AWX + description: Kind of the deployment type + type: string + ldap_cacert_secret: + description: Secret where can be found the LDAP trusted Certificate + Authority Bundle type: string loadbalancer_annotations: description: Annotations to add to the loadbalancer @@ -135,9 +144,6 @@ spec: node_selector: description: nodeSelector for the pods type: string - service_labels: - description: Additional labels to apply to the service - type: string old_postgres_configuration_secret: description: Secret where the old database configuration can be found for data migration @@ -154,46 +160,50 @@ spec: postgres_image_version: description: PostgreSQL container image version to use type: string + postgres_label_selector: + description: Label selector used to identify postgres pod for data + migration + type: string + postgres_resource_requirements: + description: Resource requirements for the PostgreSQL container + properties: + limits: + properties: + cpu: + type: string + memory: + type: string + type: object + requests: + properties: + cpu: + type: string + memory: + type: string + type: object + type: object postgres_selector: description: nodeSelector for the Postgres pods type: string - postgres_tolerations: - description: node tolerations for the Postgres pods + postgres_storage_class: + description: Storage class to use for the PostgreSQL PVC type: string postgres_storage_requirements: description: Storage requirements for the PostgreSQL container properties: - requests: - properties: - storage: - type: string - type: object limits: properties: storage: type: string type: object - type: object - postgres_resource_requirements: - description: Resource requirements for the PostgreSQL container - properties: requests: properties: - cpu: - type: string - memory: - type: string - type: object - limits: - properties: - cpu: - type: string - memory: + storage: type: string type: object type: object - postgres_storage_class: - description: Storage class to use for the PostgreSQL PVC + postgres_tolerations: + description: node tolerations for the Postgres pods type: string projects_existing_claim: description: PersistentVolumeClaim to mount /var/lib/projects directory @@ -226,9 +236,6 @@ spec: redis_image_version: description: Redis container image version to use type: string - service_account_annotations: - description: ServiceAccount annotations - type: string replicas: default: 1 description: Number of instance replicas @@ -252,6 +259,22 @@ spec: secret_key_secret: description: Secret where the secret key can be found type: string + service_account_annotations: + description: ServiceAccount annotations + type: string + service_labels: + description: Additional labels to apply to the service + type: string + service_type: + description: The service type to be used on the deployed instance + enum: + - LoadBalancer + - loadbalancer + - ClusterIP + - clusterip + - NodePort + - nodeport + type: string task_args: items: type: string @@ -261,10 +284,6 @@ spec: type: string type: array task_extra_env: - description: Environment variables to be added to Task container - type: string - ee_extra_volume_mounts: - description: Specify volume mounts to be added to Execution container type: string task_extra_volume_mounts: description: Specify volume mounts to be added to Task container @@ -307,10 +326,9 @@ spec: type: string type: array web_extra_env: - description: Environment variables to be added to Web container type: string web_extra_volume_mounts: - description: Specify volume mounts to be added to web container + description: Specify volume mounts to be added to the Web container type: string web_resource_requirements: description: Resource requirements for the web container @@ -334,19 +352,21 @@ spec: type: string type: object type: object - extra_settings: - description: Extra settings to specify for the API - items: - properties: - setting: - type: string - value: - type: string - type: object - type: array type: object status: properties: + URL: + description: URL to access the deployed instance + type: string + adminPasswordSecret: + description: Admin password secret name of the deployed instance + type: string + adminUser: + description: Admin user of the deployed instance + type: string + broadcastWebsocketSecret: + description: Broadcast websocket secret name of the deployed instance + type: string conditions: description: The resulting conditions when a Service Telemetry is instantiated @@ -362,20 +382,17 @@ spec: type: string type: object type: array - adminPasswordSecret: - description: Admin password of the deployed instance - type: string - adminUser: - description: Admin user of the deployed instance - type: string image: description: URL of the image used for the deployed instance type: string migratedFromSecret: description: The secret used for migrating an old instance. type: string - URL: - description: URL to access the deployed instance + postgresConfigurationSecret: + description: Postgres Configuration secret name of the deployed instance + type: string + secretKeySecret: + description: Secret key secret name of the deployed instance type: string version: description: Version of the deployed instance