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

feat(otellogs): support tolerations, nodeSelector and affinity for daemonset #2158

Merged
merged 3 commits into from Mar 1, 2022

Conversation

sumo-drosiek
Copy link
Contributor

Description

Support tolerations, nodeSelector and affinity for otellogs daemonset


Checklist

Remove items which don't apply to your PR.

  • Changelog updated
Testing performed
  • Redeploy fluentd and fluentd-events pods
  • Confirm events, logs, and metrics are coming in

…emonset

Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek sumo-drosiek requested a review from a team as a code owner February 28, 2022 16:51
@sumo-drosiek sumo-drosiek added this to the v2.6 milestone Feb 28, 2022
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
Comment on lines +33 to +44
{{- if .Values.otellogs.daemonset.nodeSelector }}
nodeSelector:
{{ toYaml .Values.otellogs.daemonset.nodeSelector | indent 8 }}
{{- end }}
{{- if or .Values.otellogs.daemonset.affinity }}
affinity:
{{ toYaml .Values.otellogs.daemonset.affinity | indent 8 }}
{{- end }}
{{- if .Values.otellogs.daemonset.tolerations }}
tolerations:
{{ toYaml .Values.otellogs.daemonset.tolerations | indent 8 }}
{{- end }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those if blocks are nice to have but since you've added the default in values.yaml I'm wondering if we should keep them.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMHO, generated template is nicer with ifs than:

nodeSelector:
  {}

Please create gh issue for that if you want to change it, as all other templates should be reviewed and changed too

@sumo-drosiek sumo-drosiek merged commit d22bbe5 into main Mar 1, 2022
@sumo-drosiek sumo-drosiek deleted the drosiek-otelcol-daemonset branch March 1, 2022 07:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants