Skip to content
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.

Sign up for GitHub

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

Enable cluster-config.load-balancer.l2-mode by default #1001

Merged
merged 4 commits into from
Jan 24, 2025
Merged

Enable cluster-config.load-balancer.l2-mode by default #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0e2b54
Enable cluster-config.load-balancer.l2-mode by default
petrutlucian94 Jan 23, 2025
23f3fda
Bump k8s-snap-api version
petrutlucian94 Jan 23, 2025
dda135a
Update unit test
petrutlucian94 Jan 23, 2025
2325127
Update test_smoke
petrutlucian94 Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/src/_parts/bootstrap_config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ Sets the CIDRs used for assigning IP addresses to Kubernetes services with type
**Type:** `bool`<br>

Determines if L2 mode should be enabled.
If omitted defaults to `false`.
If omitted defaults to `true`.

### cluster-config.load-balancer.l2-interfaces
**Type:** `[]string`<br>
Expand Down
2 changes: 1 addition & 1 deletion src/k8s/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ toolchain go1.23.4
require (
dario.cat/mergo v1.0.0
github.com/canonical/go-dqlite/v2 v2.0.0
github.com/canonical/k8s-snap-api v1.0.15
github.com/canonical/k8s-snap-api v1.0.16
github.com/canonical/lxd v0.0.0-20250113143058-52441d41dab7
github.com/canonical/microcluster/v2 v2.1.1-0.20250115174915-f2320c71e720
github.com/go-logr/logr v1.4.2
Expand Down
4 changes: 2 additions & 2 deletions src/k8s/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0 h1:nvj0OLI3YqYXe
github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
github.com/canonical/go-dqlite/v2 v2.0.0 h1:RNFcFVhHMh70muKKErbW35rSzqmAFswheHdAgxW0Ddw=
github.com/canonical/go-dqlite/v2 v2.0.0/go.mod h1:IaIC8u4Z1UmPjuAqPzA2r83YMaMHRLoKZdHKI5uHCJI=
github.com/canonical/k8s-snap-api v1.0.15 h1:uhEJiEhrK93tJAly+quuAayanMhT/5vpePlG+xxVCPA=
github.com/canonical/k8s-snap-api v1.0.15/go.mod h1:LDPoIYCeYnfgOFrwVPJ/4edGU264w7BB7g0GsVi36AY=
github.com/canonical/k8s-snap-api v1.0.16 h1:j1VPvWimgRt3P5uRtD2ZCPGalSFvU5AJ/Jbz60QMoBs=
github.com/canonical/k8s-snap-api v1.0.16/go.mod h1:LDPoIYCeYnfgOFrwVPJ/4edGU264w7BB7g0GsVi36AY=
github.com/canonical/lxd v0.0.0-20250113143058-52441d41dab7 h1:lZCOt9/1KowNdnWXjfA1/51Uj7+R0fKtByos9EVrYn4=
github.com/canonical/lxd v0.0.0-20250113143058-52441d41dab7/go.mod h1:4Ssm3YxIz8wyazciTLDR9V0aR2GPlGIHb+S0182T5pA=
github.com/canonical/microcluster/v2 v2.1.1-0.20250115174915-f2320c71e720 h1:LLegPoZ5bY/PGx3x1xtzggy2xvQvZ5sCw6jlQJ3BRFg=
Expand Down
2 changes: 1 addition & 1 deletion src/k8s/pkg/k8sd/types/cluster_config_defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func (c *ClusterConfig) SetDefaults() {
c.LoadBalancer.CIDRs = utils.Pointer([]string{})
}
if c.LoadBalancer.L2Mode == nil {
c.LoadBalancer.L2Mode = utils.Pointer(false)
c.LoadBalancer.L2Mode = utils.Pointer(true)
}
if c.LoadBalancer.L2Interfaces == nil {
c.LoadBalancer.L2Interfaces = utils.Pointer([]string{})
Expand Down
2 changes: 1 addition & 1 deletion src/k8s/pkg/k8sd/types/cluster_config_defaults_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func TestSetDefaults(t *testing.T) {
LoadBalancer: types.LoadBalancer{
Enabled: utils.Pointer(false),
CIDRs: utils.Pointer([]string{}),
L2Mode: utils.Pointer(false),
L2Mode: utils.Pointer(true),
L2Interfaces: utils.Pointer([]string{}),
BGPMode: utils.Pointer(false),
BGPLocalASN: utils.Pointer(0),
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/tests/test_smoke.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
r"network:\s*enabled",
r"dns:\s*enabled at (\d{1,3}(?:\.\d{1,3}){3})",
r"ingress:\s*enabled",
r"load-balancer:\s*enabled, Unknown mode",
r"load-balancer:\s*enabled, L2 mode",
r"local-storage:\s*enabled at /var/snap/k8s/common/rawfile-storage",
r"gateway\s*enabled",
]
Expand Down Expand Up @@ -145,6 +145,6 @@ def status_output_matches(p: subprocess.CompletedProcess) -> bool:
return True

LOG.info("Verifying the output of `k8s status`")
util.stubbornly(retries=10, delay_s=10).on(instance).until(
util.stubbornly(retries=15, delay_s=10).on(instance).until(
condition=status_output_matches,
).exec(["k8s", "status", "--wait-ready"])
Loading