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

Fix agent dashboard ConfigMap #28542

Merged
merged 1 commit into from
Oct 31, 2023
Merged

Fix agent dashboard ConfigMap #28542

merged 1 commit into from
Oct 31, 2023

Conversation

bakito
Copy link
Contributor

@bakito bakito commented Oct 11, 2023 •
edited by joestringer
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!

This PR fixes the rendering of the cilium agent dashboard ConfigMap if enabled.

dashboards:
  enabled: true

Fix Helm rendering for `dashboards.enabled=true`

@bakito bakito requested review from a team as code owners October 11, 2023 19:02
@bakito bakito requested a review from squeed October 11, 2023 19:02
@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 Oct 11, 2023
@github-actions github-actions bot added the kind/community-contribution This was a contribution made by a community member. label Oct 11, 2023
@squeed
Copy link
Contributor

squeed commented Oct 13, 2023

Good catch :-)

@squeed squeed added the release-note/bug This PR fixes an issue in a previous release of Cilium. label Oct 13, 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 Oct 13, 2023
@squeed
Copy link
Contributor

squeed commented Oct 13, 2023

Can you please write a more descriptive release-node entry? Then we can merge this.

squeed
squeed requested changes Oct 13, 2023
View reviewed changes
Copy link
Contributor

@squeed squeed left a comment

Choose a reason for hiding this comment

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

Two requests:

  • Please write a more descriptive release-note. Include a short summary of what went wrong
  • Add a "Fixes: (commit id") line in the commit message, pointing to the commit that introduced the bug. This makes it easier to "follow the chain". Thanks!

@bakito
Copy link
Contributor Author

bakito commented Oct 15, 2023

Two requests:

  • Please write a more descriptive release-note. Include a short summary of what went wrong
  • Add a "Fixes: (commit id") line in the commit message, pointing to the commit that introduced the bug. This makes it easier to "follow the chain". Thanks!

@squeed I changed it. Is it OK like this?

@squeed
Copy link
Contributor

squeed commented Oct 23, 2023

@bakito Sorry, I wasn't specific enough -- the "fixes: xxxx" should be in the commit message (i.e. not the first line). Then GitHub automatically parses it and we can follow bugs up the chain. Fix that and we can merge this :-)

@bakito bakito force-pushed the main branch 4 times, most recently from 6b64a4f to 87e8714 Compare October 23, 2023 12:01
@bakito
Copy link
Contributor Author

bakito commented Oct 23, 2023

@bakito Sorry, I wasn't specific enough -- the "fixes: xxxx" should be in the commit message (i.e. not the first line). Then GitHub automatically parses it and we can follow bugs up the chain. Fix that and we can merge this :-)

@squeed sorry for that, I didn't know this feature.

@dylandreimerink
Copy link
Member

/test

@aanm
Copy link
Member

aanm commented Oct 31, 2023

/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 Oct 31, 2023
@aanm aanm merged commit 5ec730f into cilium:main Oct 31, 2023
61 of 62 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@squeed squeed squeed approved these changes

Assignees
No one assigned
Labels
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/bug This PR fixes an issue in a previous release of Cilium.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@bakito @squeed @dylandreimerink @aanm