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

spire: add scheduling configurations to helm-chart #27229

Merged

Conversation

tvonhacht-apple
Copy link
Contributor

Please ensure your pull request adheres to the following guidelines:

  • For first time contributors, read Submitting a pull request
  • All code is covered by unit and/or runtime tests where feasible.
  • All commits contain a well written commit description including a title,
    description and a Fixes: #27228 line if the commit addresses a particular
    GitHub issue.
  • All commits are signed off. See the section Developer’s Certificate of Origin
  • Provide a title or release-note blurb suitable for the release notes.
  • Thanks for contributing!

Previously, it was not possible to run the spire-agent on nodes with taints like the cilium-agent does by default. This feature matches similar behaviour.

Added as well options to define affinity, nodeSelector and tolerations for spire-server.

Fixes: #27228

spire: add scheduling configurations to helm-chart

@tvonhacht-apple tvonhacht-apple requested review from a team as code owners August 3, 2023 02:26
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Aug 3, 2023
@github-actions github-actions bot added the kind/community-contribution This was a contribution made by a community member. label Aug 3, 2023
@squeed squeed requested a review from meyskens August 3, 2023 13:32
@squeed
Copy link
Contributor

squeed commented Aug 3, 2023

Seems reasonable. You'll need to update values.yaml.tmpl for CI to pass.

To @meyskens for a SPIRE sanity-check (but it looks fine to me).

@tvonhacht-apple tvonhacht-apple force-pushed the feature/helm-chart-spire-scheduling branch from 05bef2f to 241d3d1 Compare August 3, 2023 13:54
@joestringer joestringer added the release-note/bug This PR fixes an issue in a previous release of Cilium. label Aug 3, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Aug 3, 2023
@joestringer
Copy link
Member

Travis is reporting that there's some other docs files that need to be updated too: https://app.travis-ci.com/github/cilium/cilium/builds/264991216

make -C Documentation update-helm-values should resolve those.

@tvonhacht-apple tvonhacht-apple force-pushed the feature/helm-chart-spire-scheduling branch from 241d3d1 to fcd4ac9 Compare August 3, 2023 21:17
Copy link
Member

@meyskens meyskens left a comment

Choose a reason for hiding this comment

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

LGTM from SPIRE side! Thanks!

@joestringer
Copy link
Member

/test

@meyskens
Copy link
Member

meyskens commented Aug 4, 2023

https://github.com/cilium/cilium/actions/runs/5764251059/job/15627825640

Seems the spire agent is not starting due to these annotations? The sysdumps should give you all info you need

@tvonhacht-apple tvonhacht-apple force-pushed the feature/helm-chart-spire-scheduling branch 2 times, most recently from 4cb3bb1 to 85dca77 Compare August 9, 2023 16:38
@joestringer
Copy link
Member

/test

@tvonhacht-apple tvonhacht-apple force-pushed the feature/helm-chart-spire-scheduling branch from 85dca77 to ba7f212 Compare August 10, 2023 00:36
@julianwiedmann
Copy link
Member

/test

Previously, it was not possible to run the spire-agent on nodes with
taints like the cilium-agent does by default. This feature matches
similar behaviour.

Added as well options to define affinity, nodeSelector and tolerations
for spire-server.

Fixes: cilium#27228

Signed-off-by: Thorben von Hacht <tvonhacht@apple.com>
@tvonhacht-apple tvonhacht-apple force-pushed the feature/helm-chart-spire-scheduling branch from ba7f212 to 08bd258 Compare August 10, 2023 17:59
@julianwiedmann
Copy link
Member

/test

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Aug 11, 2023
@lmb lmb merged commit b599370 into cilium:main Aug 16, 2023
59 checks passed
@maintainer-s-little-helper maintainer-s-little-helper bot removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Aug 16, 2023
@sayboras sayboras added the needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch label Oct 16, 2023
@tklauser tklauser added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Oct 24, 2023
@tklauser tklauser mentioned this pull request Oct 24, 2023
14 tasks
@tklauser tklauser added backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. and removed backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Oct 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. kind/community-contribution This was a contribution made by a community member. release-note/bug This PR fixes an issue in a previous release of Cilium.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

spire-agent not able to run on tainted nodes
8 participants