internet/awx-operator
3
0
Fork 0
mirror of https://github.com/ansible/awx-operator.git synced 2026-03-26 21:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #96 from Spredzy/default_and_v1

Browse Source 
Move to apiextensions.k8s.io/v1 and enable default value on CRD
This commit is contained in:
Yanis Guenane
2021-02-16 15:32:34 +01:00
committed by GitHub
parent 1a58392804 25fc21a6cd
commit 3b9b4225ae
5 changed files with 435 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
ansible/templates/crd.yml.j2
View File

@@ -1,5 +1,5 @@
--- ---
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: awxs.awx.ansible.com name: awxs.awx.ansible.com
@@ -11,18 +11,115 @@ spec:
plural: awxs plural: awxs
singular: awx singular: awx
scope: Namespaced scope: Namespaced
subresources:
status: {}
version: v1beta1
versions: versions:
- name: v1beta1 - name: v1beta1
served: true served: true
storage: true storage: true
validation: subresources:
openAPIV3Schema: status: {}
description: Schema validation for the AWX CRD schema:
type: object openAPIV3Schema:
properties: description: Schema validation for the AWX CRD
spec:
type: object
properties: properties:
spec:
properties:
tower_hostname:
description: The hostname of the instance
type: string
tower_admin_email:
description: The admin user email
type: string
tower_admin_password_secret:
description: Secret where the admin password can be found
type: string
tower_postgres_configuration_secret:
description: Secret where the database configuration can be found
type: string
tower_secret_key_secret:
description: Secret where the secret key can be found
type: string
tower_ingress_type:
description: The ingress type to use to reach the deployed instance
type: string
enum:
- none
- Ingress
- ingress
- Route
- route
tower_route_host:
description: The DNS to use to points to the instance
type: string
tower_route_tls_termination_mechanism:
description: The secure TLS termination mechanism to use
type: string
default: Edge
enum:
- Edge
- edge
- Passthrough
- passthrough
tower_route_tls_secret:
description: Secret where the TLS related credentials are stored
type: string
tower_image_pull_policy:
description: The image pull policy
type: string
default: IfNotPresent
enum:
- Always
- always
- Never
- never
- IfNotPresent
- ifnotpresent
tower_task_resource_requirements:
description: Resource requirements for the task container
type: object
tower_web_resource_requirements:
description: Resource requirements for the web container
type: object
tower_replicas:
description: Number of instance replicas
type: integer
default: 1
format: int32
tower_garbage_collect_secrets:
description: Whether or not to remove secrets upon instance removal
default: false
type: boolean
tower_create_preload_data:
description: Whether or not to preload data upon Tower instance creation
default: true
type: boolean
type: object
status:
properties:
towerURL:
description: URL to access the deployed instance
type: string
towerAdminUser:
description: Admin user of the deployed instance
type: string
towerAdminPasswordSecret:
description: Admin password of the deployed instance
type: string
towerVersion:
description: Version of the deployed instance
type: string
conditions:
description: The resulting conditions when a Service Telemetry is instantiated
items:
properties:
status:
type: string
type:
type: string
reason:
type: string
lastTransitionTime:
type: string
type: object
type: array
type: object
type: object

120
deploy/awx-operator.yaml
View File

@@ -11,6 +11,7 @@ rules:
- route.openshift.io - route.openshift.io
resources: resources:
- routes - routes
- routes/custom-host
verbs: verbs:
- '*' - '*'
- apiGroups: - apiGroups:
@@ -139,7 +140,7 @@ spec:
emptyDir: {} emptyDir: {}
--- ---
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: awxs.awx.ansible.com name: awxs.awx.ansible.com
@@ -151,18 +152,115 @@ spec:
plural: awxs plural: awxs
singular: awx singular: awx
scope: Namespaced scope: Namespaced
subresources:
status: {}
version: v1beta1
versions: versions:
- name: v1beta1 - name: v1beta1
served: true served: true
storage: true storage: true
validation: subresources:
openAPIV3Schema: status: {}
description: Schema validation for the AWX CRD schema:
type: object openAPIV3Schema:
properties: description: Schema validation for the AWX CRD
spec:
type: object
properties: properties:
spec:
properties:
tower_hostname:
description: The hostname of the instance
type: string
tower_admin_email:
description: The admin user email
type: string
tower_admin_password_secret:
description: Secret where the admin password can be found
type: string
tower_postgres_configuration_secret:
description: Secret where the database configuration can be found
type: string
tower_secret_key_secret:
description: Secret where the secret key can be found
type: string
tower_ingress_type:
description: The ingress type to use to reach the deployed instance
type: string
enum:
- none
- Ingress
- ingress
- Route
- route
tower_route_host:
description: The DNS to use to points to the instance
type: string
tower_route_tls_termination_mechanism:
description: The secure TLS termination mechanism to use
type: string
default: Edge
enum:
- Edge
- edge
- Passthrough
- passthrough
tower_route_tls_secret:
description: Secret where the TLS related credentials are stored
type: string
tower_image_pull_policy:
description: The image pull policy
type: string
default: IfNotPresent
enum:
- Always
- always
- Never
- never
- IfNotPresent
- ifnotpresent
tower_task_resource_requirements:
description: Resource requirements for the task container
type: object
tower_web_resource_requirements:
description: Resource requirements for the web container
type: object
tower_replicas:
description: Number of instance replicas
type: integer
default: 1
format: int32
tower_garbage_collect_secrets:
description: Whether or not to remove secrets upon instance removal
default: false
type: boolean
tower_create_preload_data:
description: Whether or not to preload data upon Tower instance creation
default: true
type: boolean
type: object
status:
properties:
towerURL:
description: URL to access the deployed instance
type: string
towerAdminUser:
description: Admin user of the deployed instance
type: string
towerAdminPasswordSecret:
description: Admin password of the deployed instance
type: string
towerVersion:
description: Version of the deployed instance
type: string
conditions:
description: The resulting conditions when a Service Telemetry is instantiated
items:
properties:
status:
type: string
type:
type: string
reason:
type: string
lastTransitionTime:
type: string
type: object
type: array
type: object
type: object

119
deploy/crds/awx_v1beta1_crd.yaml
View File

@@ -1,5 +1,5 @@
--- ---
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: awxs.awx.ansible.com name: awxs.awx.ansible.com
@@ -11,18 +11,115 @@ spec:
plural: awxs plural: awxs
singular: awx singular: awx
scope: Namespaced scope: Namespaced
subresources:
status: {}
version: v1beta1
versions: versions:
- name: v1beta1 - name: v1beta1
served: true served: true
storage: true storage: true
validation: subresources:
openAPIV3Schema: status: {}
description: Schema validation for the AWX CRD schema:
type: object openAPIV3Schema:
properties: description: Schema validation for the AWX CRD
spec:
type: object
properties: properties:
spec:
properties:
tower_hostname:
description: The hostname of the instance
type: string
tower_admin_email:
description: The admin user email
type: string
tower_admin_password_secret:
description: Secret where the admin password can be found
type: string
tower_postgres_configuration_secret:
description: Secret where the database configuration can be found
type: string
tower_secret_key_secret:
description: Secret where the secret key can be found
type: string
tower_ingress_type:
description: The ingress type to use to reach the deployed instance
type: string
enum:
- none
- Ingress
- ingress
- Route
- route
tower_route_host:
description: The DNS to use to points to the instance
type: string
tower_route_tls_termination_mechanism:
description: The secure TLS termination mechanism to use
type: string
default: Edge
enum:
- Edge
- edge
- Passthrough
- passthrough
tower_route_tls_secret:
description: Secret where the TLS related credentials are stored
type: string
tower_image_pull_policy:
description: The image pull policy
type: string
default: IfNotPresent
enum:
- Always
- always
- Never
- never
- IfNotPresent
- ifnotpresent
tower_task_resource_requirements:
description: Resource requirements for the task container
type: object
tower_web_resource_requirements:
description: Resource requirements for the web container
type: object
tower_replicas:
description: Number of instance replicas
type: integer
default: 1
format: int32
tower_garbage_collect_secrets:
description: Whether or not to remove secrets upon instance removal
default: false
type: boolean
tower_create_preload_data:
description: Whether or not to preload data upon Tower instance creation
default: true
type: boolean
type: object
status:
properties:
towerURL:
description: URL to access the deployed instance
type: string
towerAdminUser:
description: Admin user of the deployed instance
type: string
towerAdminPasswordSecret:
description: Admin password of the deployed instance
type: string
towerVersion:
description: Version of the deployed instance
type: string
conditions:
description: The resulting conditions when a Service Telemetry is instantiated
items:
properties:
status:
type: string
type:
type: string
reason:
type: string
lastTransitionTime:
type: string
type: object
type: array
type: object
type: object

198
deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml
View File

@@ -1,5 +1,5 @@
--- ---
apiVersion: apiextensions.k8s.io/v1beta1 apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
creationTimestamp: null creationTimestamp: null
@@ -12,95 +12,115 @@ spec:
plural: awxs plural: awxs
singular: awx singular: awx
scope: Namespaced scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: Schema validation for the AWX CRD
properties:
spec:
properties:
tower_hostname:
description: The hostname of the instance
type: string
tower_admin_email:
description: The admin user email
type: string
tower_admin_password_secret:
description: Secret where the admin password can be found
type: string
tower_postgres_configuration_secret:
description: Secret where the database configuration can be found
type: string
tower_secret_key_secret:
description: Secret where the secret key can be found
type: string
tower_ingress_type:
description: The ingress type to use to reach the deployed instance
type: string
enum:
- none
- Ingress
- Route
tower_route_host:
description: The DNS to use to points to the instance
type: string
tower_route_tls_termination_mechanism:
description: The secure TLS termination mechanism to use
type: string
enum:
- Edge
- Passthrough
tower_route_tls_secret:
description: Secret where the TLS related credentials are stored
type: string
tower_image_pull_policy:
description: The image pull policy
type: string
enum:
- Always
- Never
- IfNotPresent
tower_task_resource_requirements:
description: Resource requirements for the task container
type: object
tower_web_resource_requirements:
description: Resource requirements for the web container
type: object
tower_replicas:
description: Number of instance replicas
type: integer
format: int32
tower_garbage_collect_secrets:
description: Whether or not to remove secrets upon instance removal
type: boolean
tower_create_preload_data:
description: Whether or not to preload data upon Tower instance creation
type: boolean
type: object
status:
properties:
towerURL:
description: URL to access the deployed instance
type: string
towerAdminUser:
description: Admin user of the deployed instance
type: string
towerAdminPasswordSecret:
description: Admin password of the deployed instance
type: string
towerVersion:
description: Version of the deployed instance
type: string
type: object
version: v1beta1
versions: versions:
- name: v1beta1 - name: v1beta1
served: true served: true
storage: true storage: true
status: subresources:
acceptedNames: status: {}
kind: "" schema:
plural: "" openAPIV3Schema:
conditions: null description: Schema validation for the AWX CRD
storedVersions: null properties:
spec:
properties:
tower_hostname:
description: The hostname of the instance
type: string
tower_admin_email:
description: The admin user email
type: string
tower_admin_password_secret:
description: Secret where the admin password can be found
type: string
tower_postgres_configuration_secret:
description: Secret where the database configuration can be found
type: string
tower_secret_key_secret:
description: Secret where the secret key can be found
type: string
tower_ingress_type:
description: The ingress type to use to reach the deployed instance
type: string
enum:
- none
- Ingress
- ingress
- Route
- route
tower_route_host:
description: The DNS to use to points to the instance
type: string
tower_route_tls_termination_mechanism:
description: The secure TLS termination mechanism to use
type: string
default: Edge
enum:
- Edge
- edge
- Passthrough
- passthrough
tower_route_tls_secret:
description: Secret where the TLS related credentials are stored
type: string
tower_image_pull_policy:
description: The image pull policy
type: string
default: IfNotPresent
enum:
- Always
- always
- Never
- never
- IfNotPresent
- ifnotpresent
tower_task_resource_requirements:
description: Resource requirements for the task container
type: object
tower_web_resource_requirements:
description: Resource requirements for the web container
type: object
tower_replicas:
description: Number of instance replicas
type: integer
default: 1
format: int32
tower_garbage_collect_secrets:
description: Whether or not to remove secrets upon instance removal
default: false
type: boolean
tower_create_preload_data:
description: Whether or not to preload data upon Tower instance creation
default: true
type: boolean
type: object
status:
properties:
towerURL:
description: URL to access the deployed instance
type: string
towerAdminUser:
description: Admin user of the deployed instance
type: string
towerAdminPasswordSecret:
description: Admin password of the deployed instance
type: string
towerVersion:
description: Version of the deployed instance
type: string
conditions:
description: The resulting conditions when a Service Telemetry is instantiated
items:
properties:
status:
type: string
type:
type: string
reason:
type: string
lastTransitionTime:
type: string
type: object
type: array
type: object
type: object

2
molecule/test-local/molecule.yml
View File

@@ -11,7 +11,7 @@ platforms:
- name: kind-test-local - name: kind-test-local
groups: groups:
- k8s - k8s
image: bsycorp/kind:latest-1.15 image: bsycorp/kind:v1.17.9
privileged: True privileged: True
override_command: no override_command: no
exposed_ports: exposed_ports: