github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-11 21:12:07 +00:00
Code Issues Projects Releases Wiki Activity

Append --feature-gates option iff TestContext.FeatureGates is not nil

Browse Source
This commit is contained in:
Penghao Cen 2017-10-26 19:04:18 +08:00
parent d12d711ba6
commit 22b04c828b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e_node/services/kubelet.go
View File

@ -165,14 +165,17 @@ func (e *E2EServices) startKubelet() (*server, error) {
// - test/e2e_node/conformance/run_test.sh. // - test/e2e_node/conformance/run_test.sh.
"--pod-cidr", "10.100.0.0/24", "--pod-cidr", "10.100.0.0/24",
"--eviction-pressure-transition-period", "30s", "--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-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. "--eviction-minimum-reclaim", "nodefs.available=5%,nodefs.inodesFree=5%", // The minimum reclaimed resources after eviction.
"--v", LOG_VERBOSITY_LEVEL, "--logtostderr", "--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) { if utilfeature.DefaultFeatureGate.Enabled(features.DynamicKubeletConfig) {
// Enable dynamic config if the feature gate is enabled // Enable dynamic config if the feature gate is enabled
dynamicConfigDir, err := getDynamicConfigDir() dynamicConfigDir, err := getDynamicConfigDir()