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

fluent operator & fluentbit: Added tolerations, nodeSelector + more #704

Merged
merged 3 commits into from
Apr 26, 2023

Conversation

felfa01
Copy link
Contributor

@felfa01 felfa01 commented Apr 24, 2023

What this PR does / why we need it:

Added support for tolerations, nodeSelector, priorityClassName and podSecurityContext to fluent-operator deployment and fluentbit daemonset

Which issue(s) this PR fixes:

Fixes fluent/helm-charts#314
Fixes #695

Does this PR introduced a user-facing change?

Added support for tolerations, nodeSelector, priorityClassName and podSecurityContext to fluent-operator deployment and fluentbit daemonset

Additional documentation, usage docs, etc.:


Signed-off-by: flxman <felix.farjsjo@gmail.com>
@felfa01 felfa01 changed the title Added tolerations, nodeSelector, priorityClassName fluentbit: Added tolerations, nodeSelector, priorityClassName Apr 24, 2023
Signed-off-by: illrill <richard.jimmy.johansson@gmail.com>
@illrill
Copy link
Contributor

illrill commented Apr 24, 2023

@felfa01 I contributed a podSecurityContext to fully resolve #695. Can you link it, and update the title and description to mention both fluent-bit and fluent-operator?

@felfa01 felfa01 changed the title fluentbit: Added tolerations, nodeSelector, priorityClassName fluent operator & fluentbit: Added tolerations, nodeSelector, priorityClassName Apr 24, 2023
@felfa01 felfa01 changed the title fluent operator & fluentbit: Added tolerations, nodeSelector, priorityClassName fluent operator & fluentbit: Added tolerations, nodeSelector + more Apr 24, 2023
@felfa01
Copy link
Contributor Author

felfa01 commented Apr 24, 2023

@felfa01 I contributed a podSecurityContext to fully resolve #695. Can you link it, and update the title and description to mention both fluent-bit and fluent-operator?

Thanks @illrill! It is updated.

Comment on lines 102 to 104
imagePullSecrets: {{ toYaml .Values.operator.imagePullSecrets | nindent 8 }}
{{- end }}
{{- if .Values.operator.tolerations }}
Copy link
Member

Choose a reason for hiding this comment

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

maybe

      imagePullSecrets: 
      {{ toYaml .Values.operator.imagePullSecrets | nindent 8 }}
      {{- end }}

better

Copy link
Contributor

Choose a reason for hiding this comment

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

Indentation style is now aligned with the rest of the manifest.

imagePullSecrets: {{ toYaml .Values.operator.imagePullSecrets | nindent 8 }}
{{- end }}
{{- if .Values.operator.tolerations }}
tolerations: {{ toYaml .Values.operator.tolerations | nindent 8 }}
Copy link
Member

Choose a reason for hiding this comment

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

ditto

tolerations: {{ toYaml .Values.operator.tolerations | nindent 8 }}
{{- end }}
{{- if .Values.operator.nodeSelector }}
nodeSelector: {{ toYaml .Values.operator.nodeSelector | nindent 8 }}
Copy link
Member

Choose a reason for hiding this comment

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

ditto

nodeSelector: {{ toYaml .Values.operator.nodeSelector | nindent 8 }}
{{- end }}
{{- if .Values.operator.podSecurityContext }}
podSecurityContext: {{ toYaml .Values.operator.podSecurityContext | nindent 8 }}
Copy link
Member

Choose a reason for hiding this comment

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

ditto

Signed-off-by: illrill <richard.jimmy.johansson@gmail.com>
@benjaminhuo
Copy link
Member

@felfa01 Thank you!

@benjaminhuo benjaminhuo merged commit 3a0da3d into fluent:master Apr 26, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants