Skip to content

v1.17 Backports 2025-06-09 #39963

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.

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

Merged
merged 2 commits into from
Jun 11, 2025
Merged

v1.17 Backports 2025-06-09 #39963

merged 2 commits into from
Jun 11, 2025

Conversation

rastislavs
Copy link
Contributor

@rastislavs rastislavs commented Jun 9, 2025

Once this PR is merged, a GitHub action will update the labels of these PRs:

 39834 38537

aanm and others added 2 commits June 9, 2025 08:55
[ upstream commit f6ac7fb ]

Add type "string" for bpf.mapDynamicSizeRatio, which caused Helm schema
validation to fail when setting it as a float.

This restores compatibility with the expected numeric input:
  --set bpf.mapDynamicSizeRatio=0.08

Fixes: 79733d2 ("helm: Introduce values.schema.json and tooling")
Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Rastislav Szabo <rastislav.szabo@isovalent.com>
[ upstream commit dd79107 ]

[ backporter's notes:
  - modified Watcher's New method to not
    take the logger arg and use the old logger
  - skipped changes in pkg/k8s/client/restConfig_provider.go
    (not present in the target branch)
]

Remove reliance on fsnotify by replacing with a polling
mechanism to check for modifications to tracked files.

There is a default interval that is configurable depending
on the usage, and it is also significantly shortened when
running tests.

Signed-off-by: Glib Smaga <code@gsmaga.com>
Signed-off-by: Rastislav Szabo <rastislav.szabo@isovalent.com>
@rastislavs rastislavs added kind/backports This PR provides functionality previously merged into master. backport/1.17 This PR represents a backport for Cilium 1.17.x of a PR that was merged to main. labels Jun 9, 2025
@rastislavs rastislavs requested review from aanm and glibsm June 9, 2025 07:47
@rastislavs
Copy link
Contributor Author

/test

@rastislavs rastislavs marked this pull request as ready for review June 9, 2025 08:47
@rastislavs rastislavs requested a review from a team as a code owner June 9, 2025 08:47
@tklauser tklauser added this pull request to the merge queue Jun 11, 2025
Merged via the queue into v1.17 with commit baae32c Jun 11, 2025
291 of 292 checks passed
@tklauser tklauser deleted the pr/v1.17-backport-2025-06-09-08-54 branch June 11, 2025 09:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.17 This PR represents a backport for Cilium 1.17.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants