Skip to content

Commit 98d93ab

Browse files
authored
Merge pull request #5745 from twz123/cplb-vs-externaladdr
Be less strict about CPLB vs. endpoint reconciler
2 parents 109d59e + 461be3e commit 98d93ab

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

cmd/controller/controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ func (c *command) start(ctx context.Context, flags *config.ControllerOptions) er
272272

273273
if enableK0sEndpointReconciler {
274274
enableK0sEndpointReconciler = false
275-
logrus.Warn("Disabling k0s endpoint reconciler as it is incompatible with control plane load balancing")
275+
logrus.Info("Disabling k0s endpoint reconciler in favor of control plane load balancing")
276276
}
277277

278278
nodeComponents.Add(ctx, &cplb.Keepalived{

docs/cplb.md

+7-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,13 @@ rules in the control plane nodes which may be incompatible with custom CNI plugi
3232

3333
### External address
3434

35-
If [`spec.api.externalAddress`](configuration.md#specapi) is defined it's mandatory to disable
36-
the [`endpoint-reconciler` component](configuration.md#disabling-controller-components) using the flag `--disable-components=endpoint-reconciler`.
35+
If [`spec.api.externalAddress`](configuration.md#specapi) is defined, control
36+
plane load balancing implicitly
37+
[disables](configuration.md#disabling-controller-components) k0s's endpoint
38+
reconciler component, just as if the `--disable-components=endpoint-reconciler`
39+
flag had been specified.
3740

38-
### Node Local Load Balancing
41+
### Node Local load balancing
3942

4043
CPLB is fully compatible with [NLLB](nllb.md), however NLLB is incompatible with [`spec.api.externalAddress`](configuration.md#specapi).
4144

@@ -542,4 +545,4 @@ TCP 192.168.122.200:6443 rr persistent 360
542545
In this example `192.168.122.200` is the virtual IP, and `192.168.122.185`, `192.168.122.87`
543546
and `192.168.122.122` are the control plane nodes.
544547

545-
All control plane nodes are expected to have the same output.
548+
All control plane nodes are expected to have the same output.

0 commit comments

Comments
 (0)