From 22b04c828bb5c3fed0218e198fa470cafd0b78e2 Mon Sep 17 00:00:00 2001 From: Penghao Cen Date: Thu, 26 Oct 2017 19:04:18 +0800 Subject: [PATCH] Append --feature-gates option iff TestContext.FeatureGates is not nil --- test/e2e_node/services/kubelet.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/e2e_node/services/kubelet.go b/test/e2e_node/services/kubelet.go index 0e655349075..46352df5d6e 100644 --- a/test/e2e_node/services/kubelet.go +++ b/test/e2e_node/services/kubelet.go @@ -165,14 +165,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()