Add kpr.Cell for KPRConfig #40026
Merged
Add kpr.Cell for KPRConfig #40026
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
|
/test |
d4fd9c9 to
b6f3069
Compare
|
/test |
|
/test |
joamaki
approved these changes
Jun 13, 2025
|
/ci-runtime |
This commit introduces kpr.Cell which provides kpr.KPRConfig. The latter is derived from KPR flags such as --kube-proxy-replacement, --enable-node-port and so on. The new cell allows pkg/loadbalancer to *not* depend on the DaemonConfigPromise when implementing the flags support (will be done in a separate PR). The promise dependence comes from the fact that previously initKubeProxyReplacement() could modify some of the flags (for example, if --kpr=true, then --enable-node-port will be set to true). The invocation of the helper function happened after the DaemonConfig has been constructed. Thus, any pkg must consume the DaemonConfig in a form of the promise to avoid the races. For now the cell contains only a few flags (required for #39767). In v1.19 we will move the rest of the flags. Afterwards, we can re-consider whether having the dedicated cell for the KPR config makes sense (for example, we could move it to pkg/loadbalancer). Signed-off-by: Martynas Pumputis <martynas@isovalent.com>
|
/test |
aanm
approved these changes
Jun 16, 2025
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
There was a problem hiding this comment.
Pull Request Overview
This PR introduces the kpr.KPRConfig struct throughout the datapath, configuration, and daemon code to replace individual option.Config flags for kube-proxy replacement. It updates cell modules, writers, node handlers, and initialization routines to accept and use the central KPRConfig, and revises tests and CLI modules accordingly.
- Propagate
kpr.KPRConfigthrough loader, node handler, config writer, and daemon startup - Replace deprecated
option.Configflags (e.g.EnableNodePort,EnableSocketLB) withkprCfgfields - Add
kpr.Cellto hive modules and update tests to passKPRConfig
Reviewed Changes
Copilot reviewed 47 out of 47 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| pkg/datapath/loader/base.go | Pass lnc.KPRConfig into IPSec device checks and socket LB calls |
| pkg/datapath/linux/{node.go,*.go} | Add kprCfg field to handler and use it in rebuild/path logic |
| pkg/datapath/linux/config/{config.go,cell.go} | Inject KPRConfig into header writer and cell params |
| daemon/cmd/{daemon.go,daemon_main.go,...} | Wire KPRConfig into daemon init, kube-proxy replacement logic, and CLI cells |
| tests | Update numerous tests to construct and verify via kpr.KPRConfig |
Comments suppressed due to low confidence (3)
daemon/cmd/daemon_main.go:38
- The alias import for
linuxdatapathwas removed butlinuxdatapath.NodeDeviceNameWithDefaultRouteis still called later, causing a compile error. Re-add the import or adjust the call.
linuxdatapath "github.com/cilium/cilium/pkg/datapath/linux"
daemon/cmd/daemon.go:45
- Calls to
linuxdatapath.NodeDeviceNameWithDefaultRouteappear in this file but thelinuxdatapathimport is missing. Add the import alias forgithub.com/cilium/cilium/pkg/datapath/linux.
github.com/cilium/cilium/pkg/kpr
daemon/healthz/kube_proxy_healthz.go:72
- The
KPRConfigfield is referenced here but it must be set when buildingkubeProxyHealthParams. Ensure the provider/invocation that constructsparamsinjects the actualkpr.KPRConfigfrom the daemon parameters, otherwise this check will always see a zero-value config.
if params.Config.KubeProxyReplacementHealthzBindAddress == "" || params.KPRConfig.KubeProxyReplacement == option.KubeProxyReplacementFalse {
|
Changing the release note here to misc, since this doesn't appear to have any user-facing impact. |
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.
See commit msgs.
Needed for #39767.
Blocked by #40022Fixes: #40028