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

Remove duplicate nodeSelector from the udev discovery manifest #675

Merged
merged 2 commits into from Nov 15, 2023

Conversation

ammmze
Copy link
Contributor

@ammmze ammmze commented Oct 27, 2023

What this PR does / why we need it:
The kube manifest for the udev-discovery-handler has 2 nodeSelector elements. It looks like they've both been there a while, but somehow recently (maybe newer version of helm in flux idk) I am getting this error when it tries to perform the helm upgrade.

Helm upgrade failed: error while running post render on files: yaml: unmarshal errors:
  line 51: mapping key "nodeSelector" already defined at line 31

The log didn't specify what file it was, but this was the only one I saw having duplicate nodeSelector fields, so I'm guessing it was this one. And the udev stuff is the only thing i'm running currently with akri.

Special notes for your reviewer:

If applicable:

  • this PR has an associated PR with documentation in akri-docs
  • this PR contains unit tests
  • added code adheres to standard Rust formatting (cargo fmt)
  • code builds properly (cargo build)
  • code is free of common mistakes (cargo clippy)
  • all Akri tests succeed (cargo test)
  • inline documentation builds (cargo doc)
  • all commits pass the DCO bot check by being signed off -- see the failing DCO check for instructions on how to retroactively sign commits

Comment on lines -19 to -20
nodeSelector:
"kubernetes.io/os": linux
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the change ... everything else was from the version bump

Copy link
Contributor

@diconico07 diconico07 left a comment

Choose a reason for hiding this comment

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

LGTM.
The k8s e2e issue is likely the same I got (and fixed) in #670, so as soon as this one gets merged you should rebase to get the fix and get all tests green.

Signed-off-by: Branden Cash <203336+ammmze@users.noreply.github.com>
Signed-off-by: Branden Cash <203336+ammmze@users.noreply.github.com>
@ammmze
Copy link
Contributor Author

ammmze commented Oct 29, 2023

LGTM. The k8s e2e issue is likely the same I got (and fixed) in #670, so as soon as this one gets merged you should rebase to get the fix and get all tests green.

Thank you! I've rebased and the checks all passed now!

@kate-goldenring kate-goldenring merged commit f7fac38 into project-akri:main Nov 15, 2023
34 checks passed
@kate-goldenring kate-goldenring mentioned this pull request Nov 15, 2023
8 tasks
@ammmze ammmze deleted the dedupe-node-selector branch December 5, 2023 04:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants