diff --git a/config/crd/bases/awx.ansible.com_awxs.yaml b/config/crd/bases/awx.ansible.com_awxs.yaml index b15f3183..0ed18bb5 100644 --- a/config/crd/bases/awx.ansible.com_awxs.yaml +++ b/config/crd/bases/awx.ansible.com_awxs.yaml @@ -1467,6 +1467,28 @@ spec: type: string type: object type: object + rsyslog_resource_requirements: + description: Resource requirements for the rsyslog container + properties: + requests: + properties: + cpu: + type: string + memory: + type: string + storage: + type: string + type: object + limits: + properties: + cpu: + type: string + memory: + type: string + storage: + type: string + type: object + type: object service_account_annotations: description: ServiceAccount annotations type: string diff --git a/config/manifests/bases/awx-operator.clusterserviceversion.yaml b/config/manifests/bases/awx-operator.clusterserviceversion.yaml index 852791f1..3d8bb484 100644 --- a/config/manifests/bases/awx-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/awx-operator.clusterserviceversion.yaml @@ -355,6 +355,11 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:resourceRequirements + - displayName: Rsyslog Container Resource Requirements + path: rsyslog_resource_requirements + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:resourceRequirements - description: The PostgreSQL container is not used when an external DB is configured displayName: PostgreSQL Container Resource Requirements path: postgres_resource_requirements diff --git a/roles/installer/defaults/main.yml b/roles/installer/defaults/main.yml index bff6bf05..0a467df5 100644 --- a/roles/installer/defaults/main.yml +++ b/roles/installer/defaults/main.yml @@ -303,10 +303,6 @@ ee_resource_requirements: memory: 64Mi # TODO: validate default resource requirements -rsyslog_resource_requirements: - requests: - cpu: 100m - memory: 128Mi # Customize CSRF options csrf_cookie_secure: False @@ -319,6 +315,12 @@ redis_resource_requirements: requests: cpu: 50m memory: 64Mi + +rsyslog_resource_requirements: + requests: + cpu: 100m + memory: 128Mi + # Add extra environment variables to the AWX task/web containers. Specify as # literal block. E.g.: # task_extra_env: | diff --git a/roles/installer/templates/deployments/task.yaml.j2 b/roles/installer/templates/deployments/task.yaml.j2 index 55326e43..512c05da 100644 --- a/roles/installer/templates/deployments/task.yaml.j2 +++ b/roles/installer/templates/deployments/task.yaml.j2 @@ -343,6 +343,7 @@ spec: {% if ee_extra_env -%} {{ ee_extra_env | indent(width=12, first=True) }} {% endif %} + resources: {{ rsyslog_resource_requirements }} - image: '{{ _image }}' name: '{{ ansible_operator_meta.name }}-rsyslog' {% if rsyslog_command %} diff --git a/roles/installer/templates/deployments/web.yaml.j2 b/roles/installer/templates/deployments/web.yaml.j2 index 41cdbc68..931c0683 100644 --- a/roles/installer/templates/deployments/web.yaml.j2 +++ b/roles/installer/templates/deployments/web.yaml.j2 @@ -277,6 +277,7 @@ spec: mountPath: "/var/run/redis" - name: rsyslog-socket mountPath: "/var/run/awx-rsyslog" + resources: {{ rsyslog_resource_requirements }} {% if bundle_ca_crt %} - name: "ca-trust-extracted" mountPath: "/etc/pki/ca-trust/extracted"