Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

feat(helm): add priorityClassName and extraLabels to kube-agent #12559

Merged
merged 4 commits into from
May 10, 2022

Conversation

r0mant
Copy link
Collaborator

@r0mant r0mant commented May 10, 2022

Buddy PR for #12264.

@webvictim Could you take a look? I've applied your comments from #12264.

Fixes #8702.

Signed-off-by: Roman Tkachenko <roman@goteleport.com>
Copy link
Contributor

@webvictim webvictim left a comment

Choose a reason for hiding this comment

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

LGTM with one nit (assuming the tests still pass)

Comment on lines -25 to -26
- matchSnapshot:
path: spec.template.spec
Copy link
Contributor

Choose a reason for hiding this comment

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

Something I didn't flag on the original PR; not sure why this is changed. It should still be spec.template.spec AFAIK.

Copy link
Collaborator Author

@r0mant r0mant May 10, 2022

Choose a reason for hiding this comment

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

@webvictim Interesting, looks like helm tests actually fail when I rollback this change. Looks like it doesn't render the entire yaml for some reason, only containers section.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I restored this change because it does seem like it's correct since we want to test against the entire resource spec, not just the template spec.

Copy link
Contributor

Choose a reason for hiding this comment

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

I changed it because spec.template.spec is the spec of Pods, while deployment annotations stay in the root object. I didn't experience issues with tests even before the change, but I felt this was incorrect, and I fixed it. Sorry for not specifying it.

@r0mant r0mant force-pushed the roman/pr-buddy-12264 branch from 74adfad to 9bfa6cd Compare May 10, 2022 22:12
@r0mant r0mant enabled auto-merge (squash) May 10, 2022 22:13
@r0mant r0mant merged commit ea39474 into master May 10, 2022
@github-actions
Copy link

@r0mant See the table below for backport results.

Branch Result
branch/v9 Failed

r0mant added a commit that referenced this pull request May 11, 2022
* feat(helm): add priorityClassName and extraLabels to kube-agent

Signed-off-by: Roman Tkachenko <roman@goteleport.com>

Co-authored-by: daquinoaldo <aldd@bendingspoons.com>
@r0mant r0mant deleted the roman/pr-buddy-12264 branch May 11, 2022 00:29
Copy link
Contributor

@daquinoaldo daquinoaldo left a comment

Choose a reason for hiding this comment

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

@r0mant, thank you for taking care of this buddy PR. I was busy these days, and I didn't have the time to apply the requested changes yet. I appreciate.

@webvictim, do you have an ETA for the release?

Comment on lines -25 to -26
- matchSnapshot:
path: spec.template.spec
Copy link
Contributor

Choose a reason for hiding this comment

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

I changed it because spec.template.spec is the spec of Pods, while deployment annotations stay in the root object. I didn't experience issues with tests even before the change, but I felt this was incorrect, and I fixed it. Sorry for not specifying it.

r0mant added a commit that referenced this pull request May 11, 2022
…) (#12568)

* feat(helm): add priorityClassName and extraLabels to kube-agent

Signed-off-by: Roman Tkachenko <roman@goteleport.com>

Co-authored-by: daquinoaldo <aldd@bendingspoons.com>

Co-authored-by: daquinoaldo <aldd@bendingspoons.com>
@webvictim webvictim mentioned this pull request Jun 8, 2022
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

helm charts should have an option to adjust labels
5 participants