mirror of https://github.com/k3s-io/k3s
Merge pull request #55475 from ScorpioCPH/fix-e2e-local-test
Automatic merge from submit-queue (batch tested with PRs 55475, 57155, 57260, 57222). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix e2e local test **What this PR does / why we need it**: Fix some issue on local e2e_node test: `Can't start e2e service "kubelet"` **Which issue(s) this PR fixes**: Fixes https://github.com/kubernetes/kubernetes/issues/54622 **Special notes for your reviewer**: **Release note**: ```release-note ``` /sig nodepull/6/head
commit
c16a336eaa
|
@ -198,14 +198,17 @@ func (e *E2EServices) startKubelet() (*server, error) {
|
|||
// - test/e2e_node/conformance/run_test.sh.
|
||||
"--pod-cidr", "10.100.0.0/24",
|
||||
"--eviction-pressure-transition-period", "30s",
|
||||
// Apply test framework feature gates by default. This could also be overridden
|
||||
// by kubelet-flags.
|
||||
"--feature-gates", framework.TestContext.FeatureGates,
|
||||
"--eviction-hard", "memory.available<250Mi,nodefs.available<10%,nodefs.inodesFree<5%", // The hard eviction thresholds.
|
||||
"--eviction-minimum-reclaim", "nodefs.available=5%,nodefs.inodesFree=5%", // The minimum reclaimed resources after eviction.
|
||||
"--v", LOG_VERBOSITY_LEVEL, "--logtostderr",
|
||||
)
|
||||
|
||||
// Apply test framework feature gates by default. This could also be overridden
|
||||
// by kubelet-flags.
|
||||
if framework.TestContext.FeatureGates != "" {
|
||||
cmdArgs = append(cmdArgs, "--feature-gates", framework.TestContext.FeatureGates)
|
||||
}
|
||||
|
||||
if utilfeature.DefaultFeatureGate.Enabled(features.DynamicKubeletConfig) {
|
||||
// Enable dynamic config if the feature gate is enabled
|
||||
dynamicConfigDir, err := getDynamicConfigDir()
|
||||
|
|
Loading…
Reference in New Issue