feat: add --kubelet-args to scheduler-k3s:initialize
The server node created by `scheduler-k3s:initialize` had no way to receive kubelet arguments, unlike nodes joined through `scheduler-k3s:cluster:add` or configured via `scheduler-k3s:profiles:add`. This meant settings such as `allowed-unsafe-sysctls` were unreachable on a single-node install.
This commit is contained in:
7 files changed
+176
-36
No files matched your search
@@ -91,3 +91,90 @@ func TestNeedsImagePullSecretsPrune(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestInitializeInstallerArgs(t *testing.T) {
|
||||
cases := []struct {
|
||||
name string
|
||||
input InitializeInstallerArgsInput
|
||||
wantPairs [][2]string
|
||||
wantAbsent []string
|
||||
}{
|
||||
{
|
||||
name: "no kubelet args",
|
||||
input: InitializeInstallerArgsInput{
|
||||
IngressClass: "traefik",
|
||||
NodeName: "ip-10-0-0-1-abc",
|
||||
Token: "sometoken",
|
||||
},
|
||||
wantAbsent: []string{"--kubelet-arg", "--node-taint"},
|
||||
},
|
||||
{
|
||||
name: "single kubelet arg",
|
||||
input: InitializeInstallerArgsInput{
|
||||
IngressClass: "traefik",
|
||||
KubeletArgs: []string{"allowed-unsafe-sysctls=net.ipv4.tcp_rmem"},
|
||||
NodeName: "ip-10-0-0-1-abc",
|
||||
Token: "sometoken",
|
||||
},
|
||||
wantPairs: [][2]string{
|
||||
{"--kubelet-arg", "allowed-unsafe-sysctls=net.ipv4.tcp_rmem"},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "multiple kubelet args each get their own flag",
|
||||
input: InitializeInstallerArgsInput{
|
||||
IngressClass: "traefik",
|
||||
KubeletArgs: []string{"allowed-unsafe-sysctls=net.ipv4.tcp_rmem", "max-pods=150"},
|
||||
NodeName: "ip-10-0-0-1-abc",
|
||||
Token: "sometoken",
|
||||
},
|
||||
wantPairs: [][2]string{
|
||||
{"--kubelet-arg", "allowed-unsafe-sysctls=net.ipv4.tcp_rmem"},
|
||||
{"--kubelet-arg", "max-pods=150"},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "kubelet args coexist with taint scheduling",
|
||||
input: InitializeInstallerArgsInput{
|
||||
IngressClass: "nginx",
|
||||
KubeletArgs: []string{"max-pods=150"},
|
||||
NodeName: "ip-10-0-0-1-abc",
|
||||
TaintScheduling: true,
|
||||
Token: "sometoken",
|
||||
},
|
||||
wantPairs: [][2]string{
|
||||
{"--node-taint", "CriticalAddonsOnly=true:NoSchedule"},
|
||||
{"--kubelet-arg", "max-pods=150"},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range cases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
got := initializeInstallerArgs(tc.input)
|
||||
|
||||
for _, pair := range tc.wantPairs {
|
||||
if !containsArgPair(got, pair[0], pair[1]) {
|
||||
t.Errorf("initializeInstallerArgs() missing %q %q, got %v", pair[0], pair[1], got)
|
||||
}
|
||||
}
|
||||
|
||||
for _, absent := range tc.wantAbsent {
|
||||
for _, arg := range got {
|
||||
if arg == absent {
|
||||
t.Errorf("initializeInstallerArgs() unexpectedly contains %q, got %v", absent, got)
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func containsArgPair(args []string, flag string, value string) bool {
|
||||
for i := 0; i < len(args)-1; i++ {
|
||||
if args[i] == flag && args[i+1] == value {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
Reference in new issue
Block a user