Merge pull request #93 from Spredzy/resource_requirements

Allow greater flexibility to specify resource requests/limits

deploy/crds/awx_v1beta1_cr.yaml

@@ -16,17 +16,10 @@ spec:
 
   tower_image: ansible/awx:15.0.0
 
-  tower_task_mem_request: 1Gi
-  tower_task_cpu_request: 500m
-
-  tower_web_mem_request: 2Gi
-  tower_web_cpu_request: 1000m
-
   tower_create_preload_data: true
 
   tower_memcached_image: memcached:alpine
 
   tower_redis_image: redis:latest
 
-  tower_postgres_storage_request: 8Gi
   tower_postgres_storage_class: ''

deploy/crds/awx_v1beta1_molecule.yaml

@@ -15,11 +15,15 @@ spec:
 
   tower_image: ansible/awx:15.0.0
 
-  tower_task_mem_request: 128M
-  tower_task_cpu_request: 500m
+  tower_web_resource_requirements:
+    requests:
+      cpu: 500m
+      memory: 128M
 
-  tower_web_mem_request: 128M
-  tower_web_cpu_request: 500m
+  tower_task_resource_requirements:
+    requests:
+      cpu: 500m
+      memory: 128M
 
   tower_create_preload_data: true
 
@@ -29,5 +33,4 @@ spec:
 
   tower_postgres_pass: awxpass
   tower_postgres_image: postgres:12
-  tower_postgres_storage_request: 8Gi
   tower_postgres_storage_class: ''

deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml

@@ -132,6 +132,16 @@ spec:
             x-descriptors:
               - urn:alm:descriptor:com.tectonic.ui:advanced
               - urn:alm:descriptor:com.tectonic.ui:imagePullPolicy
+          - displayName: Web container resource requirements
+            path: tower_web_resource_requirements
+            x-descriptors:
+              - urn:alm:descriptor:com.tectonic.ui:advanced
+              - urn:alm:descriptor:com.tectonic.ui:resourceRequirements
+          - displayName: Task container resource requirements
+            path: tower_task_resource_requirements
+            x-descriptors:
+              - urn:alm:descriptor:com.tectonic.ui:advanced
+              - urn:alm:descriptor:com.tectonic.ui:resourceRequirements
           - displayName: Replicas
             path: tower_replicas
             x-descriptors:

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

@@ -61,6 +61,12 @@ spec:
                 - 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