Skip to content

helm: fix duplicate configmap key for bpf-lb-sock-terminate-pod-connections #35703

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 1 commit into from
Nov 4, 2024
Merged

helm: fix duplicate configmap key for bpf-lb-sock-terminate-pod-connections #35703

merged 1 commit into from
Nov 4, 2024

Conversation

solidDoWant
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: #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!

Previously, when both socketLB.enabled and socketLB.terminatePodConnections were set in the Helm chart, the cilium-configmap would include the bpf-lb-sock-terminate-pod-connections twice. This fixes the issue by only emitting the key once.

This issue appears to affect Flux CD HelmReleases, but not Helmfile for some reason. I think Flux renders the Helm chart internally prior to sending the manifests to the API server, whereas Helmfile invokes helm, which appears to remove or otherwise merge duplicate keys.

helm: fix duplicate configmap key for `bpf-lb-sock-terminate-pod-connections`

@solidDoWant solidDoWant requested review from a team as code owners November 2, 2024 09:22
@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 2, 2024
@github-actions github-actions bot added the kind/community-contribution This was a contribution made by a community member. label Nov 2, 2024
youngnick
youngnick approved these changes Nov 4, 2024
View reviewed changes
Copy link
Contributor

@youngnick youngnick 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 sig-k8s.

gandro
gandro reviewed Nov 4, 2024
View reviewed changes
Copy link
Member

@gandro gandro left a comment

Choose a reason for hiding this comment

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

Looks good overall. One minor question

@gandro gandro added release-note/bug This PR fixes an issue in a previous release of Cilium. area/helm Impacts helm charts and user deployment experience needs-backport/1.16 This PR / issue needs backporting to the v1.16 branch labels Nov 4, 2024
@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 4, 2024
@solidDoWant solidDoWant requested a review from gandro November 4, 2024 10:17
gandro
gandro reviewed Nov 4, 2024
View reviewed changes
Copy link
Member

@gandro gandro left a comment

Choose a reason for hiding this comment

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

Thanks for the change! Could you squash your commits into one with git rebase? Other than that this PR should then be good to go.

@solidDoWant
helm: fix duplicate configmap key for `bpf-lb-sock-terminate-pod-conn…
727d0b4 
…ections`

Previously, when both `socketLB.enabled` and
`socketLB.terminatePodConnections`were set in the Helm chart, the
cilium-configmap would include the
`bpf-lb-sock-terminate-pod-connections` twice. This fixes the
issue by only emitting the key once.

Signed-off-by: Fred Heinecke <fred.heinecke@yahoo.com>
@solidDoWant solidDoWant force-pushed the patch/fix-duplicate-configmap-key-1 branch from b270f55 to 727d0b4 Compare November 4, 2024 11:00
@solidDoWant
Copy link
Contributor Author

Sure - done.

@gandro gandro enabled auto-merge November 4, 2024 11:07
@gandro
Copy link
Member

gandro commented Nov 4, 2024

/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 4, 2024
@gandro gandro added this pull request to the merge queue Nov 4, 2024
Merged via the queue into cilium:main with commit 3ce7b9f Nov 4, 2024
63 of 64 checks passed
@joamaki joamaki mentioned this pull request Nov 5, 2024
Merged
23 tasks
@joamaki joamaki added backport-pending/1.16 The backport for Cilium 1.16.x for this PR is in progress. and removed needs-backport/1.16 This PR / issue needs backporting to the v1.16 branch labels Nov 5, 2024
@github-actions github-actions bot added backport-done/1.16 The backport for Cilium 1.16.x for this PR is done. and removed backport-pending/1.16 The backport for Cilium 1.16.x for this PR is in progress. labels Nov 7, 2024
@cilium-release-bot cilium-release-bot bot mentioned this pull request Nov 13, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gandro gandro gandro approved these changes

@youngnick youngnick youngnick approved these changes

Assignees
No one assigned
Labels
area/helm Impacts helm charts and user deployment experience backport-done/1.16 The backport for Cilium 1.16.x for this PR is done. 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.
4 participants
@solidDoWant @gandro @youngnick @joamaki