Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added capability to set the rsyslog container resources #1410

Merged
merged 11 commits into from
May 17, 2023

Conversation

rakesh561
Copy link
Contributor

@rakesh561 rakesh561 commented May 16, 2023

SUMMARY

This commit allows users to set requests and limits on rsyslog containers and address issue #1380

ISSUE TYPE
  • New or Enhanced Feature

@rakesh561 rakesh561 changed the title Update awx.ansible.com_awxs.yaml with rsyslog resource containers Added capability to set the rsyslog container resources #1410 May 16, 2023
@rakesh561 rakesh561 changed the title Added capability to set the rsyslog container resources #1410 Added capability to set the rsyslog container resources May 16, 2023
@rooftopcellist rooftopcellist self-requested a review May 16, 2023 22:04
@rooftopcellist
Copy link
Member

@rakesh561 CI is complaining about some trailing whitespace. Do you mind fixing that in your PR?

There also seems to be some sort of syntax issue in the AWX CRD based on this error:

MalformedYAMLError: yaml: line 1470: did not find expected key in File: bases/awx.ansible.com_awxs.yaml

1 similar comment
@rooftopcellist
Copy link
Member

@rakesh561 CI is complaining about some trailing whitespace. Do you mind fixing that in your PR?

There also seems to be some sort of syntax issue in the AWX CRD based on this error:

MalformedYAMLError: yaml: line 1470: did not find expected key in File: bases/awx.ansible.com_awxs.yaml

@rakesh561
Copy link
Contributor Author

@rooftopcellist will do thanks for the quick review

@rooftopcellist
Copy link
Member

@rakesh561 CI is complaining about some trailing whitespace. Do you mind fixing that in your PR?

There also seems to be some sort of syntax issue in the AWX CRD based on this error:

MalformedYAMLError: yaml: line 1470: did not find expected key in File: bases/awx.ansible.com_awxs.yaml

It looks like there are two indentation errors that need to be fixed before this will work. Once those are fixed, I will happily merge this. Thanks!

@rakesh561 rakesh561 requested a review from rooftopcellist May 16, 2023 22:28
@rakesh561 rakesh561 requested a review from rooftopcellist May 16, 2023 23:44
@rooftopcellist
Copy link
Member

Thanks for putting this all together @rakesh561 !

@rooftopcellist rooftopcellist merged commit 721d681 into ansible:devel May 17, 2023
@EvoAdam
Copy link

EvoAdam commented May 19, 2023

Hello,
In roles/installer/templates/deployments/task.yaml.j2
the
resources: {{ rsyslog_resource_requirements }} (line 346)
is in the same block as the
resources: {{ ee_resource_requirements }} (line 283)

so it overwrites the existing config, and the rsyslog container starts without the configured limits.

Please check this
Thank you

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants