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.

Sign up for GitHub

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

Jump to bottom

Ensure logging pods only run on Linux nodes #778

Merged
merged 1 commit into from
Oct 14, 2020
Merged

Ensure logging pods only run on Linux nodes #778

merged 1 commit into from
Oct 14, 2020

Conversation

nickgerace
Copy link
Contributor

@nickgerace nickgerace commented Oct 12, 2020 •
edited
Loading

Ensure logging pods only run on Linux nodes by adding tolerations and
node selectors for fluentbit and fluentd. The tolerations have
"NoSchedule" for Windows nodes, and the node selectors look for nodes
with a Linux-based OS.

Solves issue: 28720

Please note: this is a re-opened version of PR #775 due to force-push error

@nickgerace nickgerace self-assigned this Oct 12, 2020
@nickgerace nickgerace mentioned this pull request Oct 12, 2020
Closed
@nickgerace nickgerace force-pushed the dev-v2.5-source branch 2 times, most recently from 388fc4a to a42c0df Compare October 12, 2020 20:17
@nickgerace nickgerace changed the title WIP: Ensure logging pods only run on Linux nodes Ensure logging pods only run on Linux nodes Oct 12, 2020
@nickgerace
Copy link
Contributor Author

This is no longer a WIP.

@nickgerace
Copy link
Contributor Author

While this is a full fix to issue 28720 from Rancher's perspective, we've uncovered an upstream bug. L204 of this file shows that the fluentd-configcheck container does not inherit the tolerances and nodeselector settings from the logging-operator.

Regardless of the upstream bug, this PR is still valid, even though the next step is to address the upstream bug.

@nickgerace nickgerace requested a review from paynejacob October 12, 2020 21:22
@nickgerace
Copy link
Contributor Author

Addressed @paynejacob's comments and have moved all hardcoded values here to values.yaml instead.

paynejacob
paynejacob previously approved these changes Oct 12, 2020
View reviewed changes
@nickgerace
Copy link
Contributor Author

nickgerace commented Oct 12, 2020 •
edited
Loading

For the curious: we double-checked that this does not affect all Linux node clusters. (EDIT: kgpa == kubectl get pods -A)

[nickgerace at rancherbook in ~/git/nickgerace/charts] (0) (dev-v2.5-source)
% kgpa
NAMESPACE               NAME                                           READY   STATUS      RESTARTS   AGE
cattle-logging-system   rancher-logging-d87d68c9c-kgsx7                1/1     Running     0          55s
cattle-logging-system   rancher-logging-fluentbit-68cbv                1/1     Running     0          41s
cattle-logging-system   rancher-logging-fluentbit-745st                1/1     Running     0          41s
cattle-logging-system   rancher-logging-fluentbit-7c6d7                1/1     Running     0          41s
cattle-logging-system   rancher-logging-fluentbit-bkt4p                1/1     Running     0          41s
cattle-logging-system   rancher-logging-fluentbit-dll4f                1/1     Running     0          41s
cattle-logging-system   rancher-logging-fluentbit-hl85n                1/1     Running     0          41s
cattle-logging-system   rancher-logging-fluentbit-sxwzr                1/1     Running     0          41s
cattle-logging-system   rancher-logging-fluentd-0                      2/2     Running     0          42s
cattle-logging-system   rancher-logging-fluentd-configcheck-c3054702   0/1     Completed   0          50s

@nickgerace
Copy link
Contributor Author

CI checks are failing. Checked in with @paynejacob, and it seems to be unrelated to this PR in particular.

@cbron cbron removed the request for review from luthermonson October 13, 2020 22:05
paynejacob
paynejacob reviewed Oct 13, 2020
View reviewed changes
Copy link
Contributor

@paynejacob paynejacob left a comment

Choose a reason for hiding this comment

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

Everything looks good outside of Caleb's comments.

@cbron cbron removed the request for review from luthermonson October 14, 2020 16:56
@nickgerace
Copy link
Contributor Author

Fixed Caleb's comments.

mrajashree
mrajashree previously approved these changes Oct 14, 2020
View reviewed changes
Copy link
Contributor

@mrajashree mrajashree left a comment

Choose a reason for hiding this comment

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

lgtm

cbron
cbron reviewed Oct 14, 2020
View reviewed changes
Copy link
Contributor

@cbron cbron left a comment

Choose a reason for hiding this comment

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

Looks good

packages/rancher-logging/overlay/templates/loggings/eks/logging.yaml Outdated Show resolved Hide resolved
cbron
cbron previously approved these changes Oct 14, 2020
View reviewed changes
@nickgerace
Ensure logging pods only run on Linux nodes
f60eeda 
Ensure logging pods only run on Linux nodes by adding tolerations and
node selectors for fluentbit and fluentd. The tolerations have
"NoSchedule" for Windows nodes, and the node selectors look for nodes
with a Linux-based OS.
@nickgerace nickgerace dismissed stale reviews from cbron and mrajashree via f60eeda October 14, 2020 20:36
@nickgerace
Copy link
Contributor Author

Fixed cosmetic issues from @cbron's comments.

@nickgerace nickgerace requested review from mrajashree and cbron and removed request for cbron October 14, 2020 20:37
@nickgerace
Copy link
Contributor Author

Removing Caleb until re-review from @paynejacob and @mrajashree. Only changes since previous approval have been cosmetic, however.

cbron
cbron approved these changes Oct 14, 2020
View reviewed changes
Copy link
Contributor

@cbron cbron left a comment

Choose a reason for hiding this comment

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

If only cosmetic we can move forward without it, but would be good to have @paynejacob confirm the new route real quick.

@nickgerace nickgerace merged commit 885f175 into rancher:dev-v2.5-source Oct 14, 2020
@nickgerace
Copy link
Contributor Author

Thanks to @bacongobbler for the recommendation on using concat here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@paynejacob paynejacob paynejacob approved these changes

@cbron cbron cbron approved these changes

@mrajashree mrajashree Awaiting requested review from mrajashree

Assignees

@nickgerace nickgerace

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nickgerace @cbron @mrajashree @paynejacob