Skip to content

helm: Fix annotation duplication problems #28978

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
Merged
merged 2 commits into from
Nov 13, 2023
Merged

helm: Fix annotation duplication problems #28978

merged 2 commits into from
Nov 13, 2023

Conversation

bradwhitfield
Copy link
Contributor

@bradwhitfield bradwhitfield commented Nov 3, 2023 •
edited
Loading

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: #XXX line if the commit addresses a particular
    GitHub issue.
  • If your commit description contains a Fixes: <commit-id> tag, then
    please add the commit author[s] as reviewer[s] to this 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.
  • Are you a user of Cilium? Please add yourself to the Users doc
  • Thanks for contributing!

Fixes: 44698df

#27860 (comment)

This change fixes duplicate annotations that can occur in the cilium-agent ServiceAccount if both annotations and serviceAccounts.cilium.annotations are defined. While testing the change, I found that the indentation on the cilium-envoy/service.yaml needed to be fixed as well. If serviceMonitor was not enabled for envoy, helm would return the error mapping values are not allowed in this context due to the indent level in the template.

helm: Fix annotation duplication problems for cilium-agent

@bradwhitfield bradwhitfield requested review from a team as code owners November 3, 2023 18:14
@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 Nov 3, 2023
@github-actions github-actions bot added the kind/community-contribution This was a contribution made by a community member. label Nov 3, 2023
@christarazi christarazi added kind/bug This is a bug in the Cilium logic. area/helm Impacts helm charts and user deployment experience labels Nov 3, 2023
@christarazi
Copy link
Member

@bradwhitfield The checkpatch job is complaining about the first commit

Error: ERROR:CUSTOM: Please avoid long commit subjects (max: 75, found: 102)

sayboras
sayboras approved these changes Nov 8, 2023
View reviewed changes
Copy link
Member

@sayboras sayboras left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@sayboras
Copy link
Member

sayboras commented Nov 8, 2023

Can you help to reduce the commit subject length to make CI job happy? The same can be run locally to iterate make -C bpf checkpatch.

Error: ERROR:CUSTOM: Please avoid long commit subjects (max: 75, found: 102)

@sayboras sayboras added the release-note/bug This PR fixes an issue in a previous release of Cilium. label Nov 8, 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 Nov 8, 2023
@sayboras sayboras changed the title fix annotation rendering problems helm: Fix annotation duplication problems Nov 8, 2023
@squeed
Copy link
Contributor

squeed commented Nov 8, 2023

/test

@bradwhitfield bradwhitfield force-pushed the fix/duplicate-annotaitons branch from 4cd48e4 to ef31f93 Compare November 8, 2023 14:55
@bradwhitfield
Copy link
Contributor Author

Thank you for the help on this. I'm having trouble getting the make command to work locally, but I pushed the suggested change. Should the release notes be less than 75 characters as well?

@bradwhitfield
Copy link
Contributor Author

I went ahead and changed the release notes. I think this one is good. Let me know if I'm mistaken.

@sayboras
Copy link
Member

/test

1 similar comment
@sayboras
Copy link
Member

/test

@bradwhitfield @sayboras
helm: fix annotation duplication problems
c71c1c8 
Fixes: 44698df ("helm: simplify auto TLS annotations and various cleanup based on PR feedback")

Signed-off-by: Brad Whitfield <bradswhitfield@gmail.com>
@bradwhitfield @sayboras
helm: fix indentation on prometheus annotations to prevent mapping error
49c585b 
Signed-off-by: Brad Whitfield <bradswhitfield@gmail.com>
@sayboras sayboras force-pushed the fix/duplicate-annotaitons branch from ef31f93 to 49c585b Compare November 11, 2023 02:14
@sayboras
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 Nov 13, 2023
@julianwiedmann
Copy link
Member

👋 given this is tagged as a bug, please consider whether backports are needed

@julianwiedmann julianwiedmann merged commit e6925b3 into cilium:main Nov 13, 2023
@bradwhitfield
Copy link
Contributor Author

👋 given this is tagged as a bug, please consider whether backports are needed

I would think it would need to be. That should be indicated by the fixes in the commit message, right?

@julianwiedmann
Copy link
Member

👋 given this is tagged as a bug, please consider whether backports are needed

I would think it would need to be. That should be indicated by the fixes in the commit message, right?

ok - then #27860 only landed in the current release, and didn't get backported. So we don't need backports, but should adjust the release-note label (as the breakage never made it into a stable release). Ty!

@julianwiedmann julianwiedmann added release-note/misc This PR makes changes that have no direct user impact. and removed release-note/bug This PR fixes an issue in a previous release of Cilium. labels Nov 14, 2023
@coro
Copy link

coro commented Nov 14, 2023

Thanks for fixing this @bradwhitfield !

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

@christarazi christarazi christarazi approved these changes

@sayboras sayboras sayboras approved these changes

Assignees
No one assigned
Labels
area/helm Impacts helm charts and user deployment experience kind/bug This is a bug in the Cilium logic. kind/community-contribution This was a contribution made by a community member. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@bradwhitfield @christarazi @sayboras @squeed @julianwiedmann @coro