v1.17 Backports 2025-06-26 #40222
Merged
v1.17 Backports 2025-06-26 #40222
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 6f33115 ] [ backporter's notes: Fixed minor conflicts in values.schema.json due to externalWorkloads removed in main branch. ] The commit f5f831f ("cilium, helm: Fix hostPort and externalIPs") removed the individual setting of each flag when --kpr=false: If KPR is false, setting these to true does not make any sense. Thus, remove this to avoid confusion. However, it kept "partial", which is removed since v1.14 [1] (EOL). Remove the options entirely. [1]: #26036 Signed-off-by: Martynas Pumputis <martynas@isovalent.com> Signed-off-by: Fabio Falzoi <fabio.falzoi@isovalent.com>
[ upstream commit 40c6f00 ] The "disabled" value is deprecated since v1.14 (EOL). Change the check to == "true" to make the assignment effective. Signed-off-by: Martynas Pumputis <martynas@isovalent.com> Signed-off-by: Fabio Falzoi <fabio.falzoi@isovalent.com>
|
/test |
brb
added a commit
that referenced
this pull request
Jul 11, 2025
The [1] commit removed the hostPort.enabled too early. It will be no longer possible to enable each individual KPR flag only in v1.19. So, before that we need to support enabling HostPort when KPR=false. [1] got backported to v1.17 by #40222 to fix [2]. NB: we did not restore externalIPs.enabled, because it is no-op when KPR=false, and it is implicitly enabled when nodePort.enabled is true. [1]: 88d1e70 [2]: #40073 Signed-off-by: Martynas Pumputis <martynas@isovalent.com>
brb
added a commit
that referenced
this pull request
Jul 11, 2025
The [1] commit removed the hostPort.enabled too early. It will be no longer possible to enable each individual KPR flag only in v1.19. So, before that we need to support enabling HostPort when KPR=false. [1] got backported to v1.17 by #40222 to fix [2]. NB: we did not restore externalIPs.enabled, because it is no-op when KPR=false, and it is implicitly enabled when nodePort.enabled is true. [1]: 88d1e70 [2]: #40073 Signed-off-by: Martynas Pumputis <martynas@isovalent.com>
brb
added a commit
that referenced
this pull request
Jul 11, 2025
The [1] commit removed the hostPort.enabled too early. It will be no longer possible to enable each individual KPR flag only in v1.19. So, before that we need to support enabling HostPort when KPR=false. [1] got backported to v1.17 by #40222 to fix [2]. NB: we did not restore externalIPs.enabled, because it is no-op when KPR=false, and it is implicitly enabled when nodePort.enabled is true. [1]: 88d1e70 [2]: #40073 Signed-off-by: Martynas Pumputis <martynas@isovalent.com>
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jul 14, 2025
The [1] commit removed the hostPort.enabled too early. It will be no longer possible to enable each individual KPR flag only in v1.19. So, before that we need to support enabling HostPort when KPR=false. [1] got backported to v1.17 by #40222 to fix [2]. NB: we did not restore externalIPs.enabled, because it is no-op when KPR=false, and it is implicitly enabled when nodePort.enabled is true. [1]: 88d1e70 [2]: #40073 Signed-off-by: Martynas Pumputis <martynas@isovalent.com>
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.
Commit f5f831f ("cilium, helm: Fix hostPort and externalIPs"), backported to v1.17 in #37126, removed the individual setting for
externalIPsandhostPortwhen KPR is disabled, but left them for KPR="partial" that has been deprecated in v1.14 (see #26036).This backport fixes that removing
nodePortandexternalIPsbut also all the other stale occurrences of the "partial" value and "disabled" value for KPR in helm.Fixes: #40073
Once this PR is merged, a GitHub action will update the labels of these PRs: