Update OLM metadata

This commit is contained in:
Shane McDonald
2021-06-02 16:42:45 -04:00
parent 25bdc23d45
commit 6347ceb976
5 changed files with 152 additions and 126 deletions

View File

@@ -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.package.v1=awx-operator
LABEL operators.operatorframework.io.bundle.channels.v1=alpha LABEL operators.operatorframework.io.bundle.channels.v1=alpha
LABEL operators.operatorframework.io.bundle.channel.default.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.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v0.19.4 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/manifests /manifests/
COPY deploy/olm-catalog/awx-operator/metadata /metadata/ COPY deploy/olm-catalog/awx-operator/metadata /metadata/

View File

@@ -14,6 +14,7 @@ metadata:
"spec": { "spec": {
"deployment_type": "awx", "deployment_type": "awx",
"ingress_type": "ingress", "ingress_type": "ingress",
"service_account_annotations": "foo: bar\n",
"task_resource_requirements": { "task_resource_requirements": {
"requests": { "requests": {
"cpu": "500m", "cpu": "500m",
@@ -38,10 +39,9 @@ spec:
apiservicedefinitions: {} apiservicedefinitions: {}
customresourcedefinitions: customresourcedefinitions:
owned: owned:
- kind: AWXBackup - displayName: AWX Backup
kind: AWXBackup
name: awxbackups.awx.ansible.com name: awxbackups.awx.ansible.com
version: v1beta1
displayName: AWX Backup
specDescriptors: specDescriptors:
- displayName: Deployment name - displayName: Deployment name
path: deployment_name path: deployment_name
@@ -73,26 +73,26 @@ spec:
- urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:advanced
- urn:alm:descriptor:com.tectonic.ui:hidden - urn:alm:descriptor:com.tectonic.ui:hidden
statusDescriptors: 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 path: backupClaim
x-descriptors: x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:text - 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 path: backupDirectory
x-descriptors: x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:text - urn:alm:descriptor:com.tectonic.ui:text
- kind: AWXRestore
name: awxrestores.awx.ansible.com
version: v1beta1 version: v1beta1
displayName: AWX Restore - displayName: AWX Restore
kind: AWXRestore
name: awxrestores.awx.ansible.com
specDescriptors: specDescriptors:
- displayName: Backup source to restore ? - displayName: Backup source to restore ?
path: backup_source path: backup_source
x-descriptors: x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:select:CR - urn:alm:descriptor:com.tectonic.ui:select:CR
- urn:alm:descriptor:com.tectonic.ui:select:PVC - urn:alm:descriptor:com.tectonic.ui:select:PVC
- displayName: Backup name - displayName: Backup name
path: backup_name path: backup_name
x-descriptors: x-descriptors:
@@ -123,11 +123,12 @@ spec:
x-descriptors: x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:hidden - urn:alm:descriptor:com.tectonic.ui:hidden
statusDescriptors: statusDescriptors:
- displayName: Restore status - description: The state of the restore
description: The state of the restore displayName: Restore status
path: restoreComplete path: restoreComplete
x-descriptors: x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:text - urn:alm:descriptor:com.tectonic.ui:text
version: v1beta1
- description: A AWX Instance - description: A AWX Instance
displayName: AWX displayName: AWX
kind: AWX kind: AWX
@@ -262,12 +263,14 @@ spec:
x-descriptors: x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:advanced
- urn:alm:descriptor:com.tectonic.ui:resourceRequirements - 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 path: postgres_resource_requirements
x-descriptors: x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:advanced
- urn:alm:descriptor:com.tectonic.ui:resourceRequirements - 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 path: postgres_storage_requirements
x-descriptors: x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced - 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:advanced
- urn:alm:descriptor:com.tectonic.ui:fieldDependency:projects_use_existing_claim:_Yes_ - urn:alm:descriptor:com.tectonic.ui:fieldDependency:projects_use_existing_claim:_Yes_
- urn:alm:descriptor:io.kubernetes:PersistentVolumeClaim - urn:alm:descriptor:io.kubernetes:PersistentVolumeClaim
- description: Projects Storage Class Name. If not present, the default - description: Projects Storage Class Name. If not present, the default storage
storage class will be used. class will be used.
displayName: Projects Storage Class Name displayName: Projects Storage Class Name
path: projects_storage_class path: projects_storage_class
x-descriptors: x-descriptors:
@@ -424,26 +427,26 @@ spec:
x-descriptors: x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:advanced
- urn:alm:descriptor:com.tectonic.ui:hidden - 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 path: task_extra_env
x-descriptors: x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:advanced
- urn:alm:descriptor:com.tectonic.ui:hidden - 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 path: ee_extra_volume_mounts
description: Specify volume mounts to be added to Execution container
x-descriptors: x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:advanced
- urn:alm:descriptor:com.tectonic.ui:hidden - 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 path: ee_images
x-descriptors: x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:advanced
- urn:alm:descriptor:com.tectonic.ui:hidden - 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 path: task_extra_volume_mounts
x-descriptors: x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:advanced
@@ -458,20 +461,20 @@ spec:
x-descriptors: x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:advanced
- urn:alm:descriptor:com.tectonic.ui:hidden - 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 path: web_extra_env
x-descriptors: x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:advanced
- urn:alm:descriptor:com.tectonic.ui:hidden - 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 path: web_extra_volume_mounts
x-descriptors: x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:advanced
- urn:alm:descriptor:com.tectonic.ui:hidden - 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 path: extra_volumes
x-descriptors: x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:advanced
@@ -607,6 +610,8 @@ spec:
- awx.ansible.com - awx.ansible.com
resources: resources:
- '*' - '*'
- awxbackups
- awxrestores
verbs: verbs:
- '*' - '*'
serviceAccountName: awx-operator serviceAccountName: awx-operator
@@ -637,7 +642,11 @@ spec:
value: awx-operator value: awx-operator
- name: ANSIBLE_GATHERING - name: ANSIBLE_GATHERING
value: explicit 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 imagePullPolicy: Always
livenessProbe: livenessProbe:
httpGet: httpGet:

View File

@@ -18,8 +18,6 @@ spec:
description: Schema validation for the AWXBackup CRD description: Schema validation for the AWXBackup CRD
properties: properties:
spec: spec:
required:
- deployment_name
properties: properties:
backup_pvc: backup_pvc:
description: Name of the PVC to be used for storing the backup 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 description: Label selector used to identify postgres pod for backing
up data up data
type: string type: string
required:
- deployment_name
type: object type: object
type: object type: object
x-kubernetes-preserve-unknown-fields: true x-kubernetes-preserve-unknown-fields: true

View File

@@ -19,12 +19,6 @@ spec:
properties: properties:
spec: spec:
properties: properties:
backup_source:
description: Backup source
type: string
enum:
- CR
- PVC
backup_dir: backup_dir:
description: Backup directory name, set as a status found on the awxbackup description: Backup directory name, set as a status found on the awxbackup
object (backupDirectory) object (backupDirectory)
@@ -39,6 +33,12 @@ spec:
backup_pvc_namespace: backup_pvc_namespace:
description: Namespace the PVC is in description: Namespace the PVC is in
type: string type: string
backup_source:
description: Backup source
enum:
- CR
- PVC
type: string
deployment_name: deployment_name:
description: Name of the deployment to be restored to description: Name of the deployment to be restored to
type: string type: string

View File

@@ -19,28 +19,6 @@ spec:
properties: properties:
spec: spec:
properties: 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: admin_email:
description: The admin user email description: The admin user email
type: string type: string
@@ -51,13 +29,30 @@ spec:
default: admin default: admin
description: Username to use for the admin account description: Username to use for the admin account
type: string type: string
api_version:
default: awx.ansible.com/v1beta1
description: apiVersion of the deployment type
type: string
broadcast_websocket_secret: broadcast_websocket_secret:
description: Secret where the broadcast websocket secret can be found description: Secret where the broadcast websocket secret can be found
type: string type: string
ca_trust_bundle:
description: Path where the trusted CA bundle is available
type: string
create_preload_data: create_preload_data:
default: true default: true
description: Whether or not to preload data upon instance creation description: Whether or not to preload data upon instance creation
type: boolean 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: ee_images:
description: Registry path to the Execution Environment container description: Registry path to the Execution Environment container
to use to use
@@ -69,6 +64,16 @@ spec:
type: string type: string
type: object type: object
type: array 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: extra_volumes:
description: Specify extra volumes to add to the application pod description: Specify extra volumes to add to the application pod
type: string type: string
@@ -82,9 +87,6 @@ spec:
image: image:
description: Registry path to the application container to use description: Registry path to the application container to use
type: string type: string
image_version:
description: Application container image version to use
type: string
image_pull_policy: image_pull_policy:
default: IfNotPresent default: IfNotPresent
description: The image pull policy description: The image pull policy
@@ -99,11 +101,14 @@ spec:
image_pull_secret: image_pull_secret:
description: The image pull secret description: The image pull secret
type: string type: string
image_version:
description: Application container image version to use
type: string
ingress_annotations: ingress_annotations:
description: Annotations to add to the ingress description: Annotations to add to the Ingress Controller
type: string type: string
ingress_tls_secret: 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 type: string
ingress_type: ingress_type:
description: The ingress type to use to reach the deployed instance description: The ingress type to use to reach the deployed instance
@@ -113,10 +118,14 @@ spec:
- ingress - ingress
- Route - Route
- route - route
- LoadBalancer type: string
- loadbalancer kind:
- NodePort default: AWX
- nodeport 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 type: string
loadbalancer_annotations: loadbalancer_annotations:
description: Annotations to add to the loadbalancer description: Annotations to add to the loadbalancer
@@ -135,9 +144,6 @@ spec:
node_selector: node_selector:
description: nodeSelector for the pods description: nodeSelector for the pods
type: string type: string
service_labels:
description: Additional labels to apply to the service
type: string
old_postgres_configuration_secret: old_postgres_configuration_secret:
description: Secret where the old database configuration can be found description: Secret where the old database configuration can be found
for data migration for data migration
@@ -154,46 +160,50 @@ spec:
postgres_image_version: postgres_image_version:
description: PostgreSQL container image version to use description: PostgreSQL container image version to use
type: string 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: postgres_selector:
description: nodeSelector for the Postgres pods description: nodeSelector for the Postgres pods
type: string type: string
postgres_tolerations: postgres_storage_class:
description: node tolerations for the Postgres pods description: Storage class to use for the PostgreSQL PVC
type: string type: string
postgres_storage_requirements: postgres_storage_requirements:
description: Storage requirements for the PostgreSQL container description: Storage requirements for the PostgreSQL container
properties: properties:
requests:
properties:
storage:
type: string
type: object
limits: limits:
properties: properties:
storage: storage:
type: string type: string
type: object type: object
type: object
postgres_resource_requirements:
description: Resource requirements for the PostgreSQL container
properties:
requests: requests:
properties: properties:
cpu: storage:
type: string
memory:
type: string
type: object
limits:
properties:
cpu:
type: string
memory:
type: string type: string
type: object type: object
type: object type: object
postgres_storage_class: postgres_tolerations:
description: Storage class to use for the PostgreSQL PVC description: node tolerations for the Postgres pods
type: string type: string
projects_existing_claim: projects_existing_claim:
description: PersistentVolumeClaim to mount /var/lib/projects directory description: PersistentVolumeClaim to mount /var/lib/projects directory
@@ -226,9 +236,6 @@ spec:
redis_image_version: redis_image_version:
description: Redis container image version to use description: Redis container image version to use
type: string type: string
service_account_annotations:
description: ServiceAccount annotations
type: string
replicas: replicas:
default: 1 default: 1
description: Number of instance replicas description: Number of instance replicas
@@ -252,6 +259,22 @@ spec:
secret_key_secret: secret_key_secret:
description: Secret where the secret key can be found description: Secret where the secret key can be found
type: string 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: task_args:
items: items:
type: string type: string
@@ -261,10 +284,6 @@ spec:
type: string type: string
type: array type: array
task_extra_env: 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 type: string
task_extra_volume_mounts: task_extra_volume_mounts:
description: Specify volume mounts to be added to Task container description: Specify volume mounts to be added to Task container
@@ -307,10 +326,9 @@ spec:
type: string type: string
type: array type: array
web_extra_env: web_extra_env:
description: Environment variables to be added to Web container
type: string type: string
web_extra_volume_mounts: 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 type: string
web_resource_requirements: web_resource_requirements:
description: Resource requirements for the web container description: Resource requirements for the web container
@@ -334,19 +352,21 @@ spec:
type: string type: string
type: object type: object
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 type: object
status: status:
properties: 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: conditions:
description: The resulting conditions when a Service Telemetry is description: The resulting conditions when a Service Telemetry is
instantiated instantiated
@@ -362,20 +382,17 @@ spec:
type: string type: string
type: object type: object
type: array type: array
adminPasswordSecret:
description: Admin password of the deployed instance
type: string
adminUser:
description: Admin user of the deployed instance
type: string
image: image:
description: URL of the image used for the deployed instance description: URL of the image used for the deployed instance
type: string type: string
migratedFromSecret: migratedFromSecret:
description: The secret used for migrating an old instance. description: The secret used for migrating an old instance.
type: string type: string
URL: postgresConfigurationSecret:
description: URL to access the deployed instance description: Postgres Configuration secret name of the deployed instance
type: string
secretKeySecret:
description: Secret key secret name of the deployed instance
type: string type: string
version: version:
description: Version of the deployed instance description: Version of the deployed instance