v1.17 Backports 2025-07-01 #40289
Merged
v1.17 Backports 2025-07-01 #40289
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[ upstream commit a1fe9e3 ] Add merge driver configuration that automatically runs specific commands when certain files are merged. This automation helps maintain consistency by running essential tasks like `go mod tidy`, updating Kubernetes manifests, regenerating documentation, and fixing permissions after merge operations. Signed-off-by: André Martins <andre@cilium.io> Signed-off-by: Tobias Klauser <tobias@cilium.io>
…ble-ipv4: false` [ upstream commit 3142e1c ] Signed-off-by: joey <zchengjoey@gmail.com> Signed-off-by: Tobias Klauser <tobias@cilium.io>
[ upstream commit cb9bcd8 ] In production clusters with several secrets, these messages may flood the operator logs since they are also logged in case of no changes (action=ignored). Example from a recent sysdump: $ grep "Reconciling secret" logs-cilium-operator-<redacted>-cilium-operator-20250626-083319.log | wc -l 36789 $ grep "Successfully reconciled Secret.*action=ignored" logs-cilium-operator-<redacted>-cilium-operator-20250626-083319.log | wc -l 36789 Decrease the log level to debug so the messages still appear in CI and during development, but their value in production clusters is limited. Signed-off-by: Tobias Klauser <tobias@cilium.io>
|
/test |
[ upstream commit 7fbf7c6 ] Racing condition when IP reassigned back to ENI, during IPAM release process. Signed-off-by: Victor Chen <victor.chenq@gmail.com> Signed-off-by: Tobias Klauser <tobias@cilium.io>
d06b8ec to
eccb15e
Compare
|
/test |
aanm
approved these changes
Jul 1, 2025
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
hubble-prefer-ipv6totrueifenable-ipv4: false#40210 (@chengjoey)PRs skipped due to conflicts:
Once this PR is merged, a GitHub action will update the labels of these PRs: