Merge pull request #6490 from mtaufen/stop-setting-kubeletconfigfile

Removal of KubeletConfigFile feature gate: Step 2 (stop setting KubeletConfigFile)
kubernetes · Jan 27, 2018 · f2655d1 · f2655d1
2 parents 4bd3f1e + e6cbc98
commit f2655d1
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 43 deletions.
diff --git a/experiment/test_config.yaml b/experiment/test_config.yaml
@@ -501,13 +501,13 @@ jobs:
     interval: 2h
     args:
     - --gcp-project=cos-image-validation
-    - --node-test-args=--feature-gates=KubeletConfigFile=true --generate-kubelet-config-file=true
+    - --node-test-args=--generate-kubelet-config-file=true
     sigOwners: ['sig-node']
   ci-kubernetes-e2enode-cosbeta-k8sdev-serial:
     interval: 2h
     args:
     - --gcp-project=cos-image-validation
-    - --node-test-args=--feature-gates=DynamicKubeletConfig=true,KubeletConfigFile=true --generate-kubelet-config-file=true
+    - --node-test-args=--feature-gates=DynamicKubeletConfig=true --generate-kubelet-config-file=true
     sigOwners: ['sig-node']
   ci-kubernetes-e2enode-cosbeta-k8sbeta-default:
     interval: 2h
@@ -553,13 +553,13 @@ jobs:
     interval: 2h
     args:
     - --gcp-project=k8s-test-63a7f7788a
-    - --node-test-args=--feature-gates=KubeletConfigFile=true --generate-kubelet-config-file=true
+    - --node-test-args=--generate-kubelet-config-file=true
     sigOwners: ['sig-node']
   ci-kubernetes-e2enode-cosstable1-k8sdev-serial:
     interval: 2h
     args:
     - --gcp-project=k8s-test-39a894cbd4
-    - --node-test-args=--feature-gates=DynamicKubeletConfig=true,KubeletConfigFile=true --generate-kubelet-config-file=true
+    - --node-test-args=--feature-gates=DynamicKubeletConfig=true --generate-kubelet-config-file=true
     sigOwners: ['sig-node']
   ci-kubernetes-e2enode-cosstable1-k8sbeta-default:
     interval: 2h
@@ -606,13 +606,13 @@ jobs:
     interval: 2h
     args:
     - --gcp-project=ubuntu-image-validation
-    - --node-test-args=--feature-gates=KubeletConfigFile=true --generate-kubelet-config-file=true
+    - --node-test-args=--generate-kubelet-config-file=true
     sigOwners: ['sig-node']
   ci-kubernetes-e2enode-ubuntudev-k8sdev-serial:
     interval: 2h
     args:
     - --gcp-project=ubuntu-image-validation
-    - --node-test-args=--feature-gates=DynamicKubeletConfig=true,KubeletConfigFile=true --generate-kubelet-config-file=true
+    - --node-test-args=--feature-gates=DynamicKubeletConfig=true --generate-kubelet-config-file=true
     sigOwners: ['sig-node']
   ci-kubernetes-e2enode-ubuntudev-k8sstable1-gkespec:
     interval: 2h
@@ -639,13 +639,13 @@ jobs:
     interval: 2h
     args:
     - --gcp-project=ubuntu-image-validation
-    - --node-test-args=--feature-gates=KubeletConfigFile=true --generate-kubelet-config-file=true
+    - --node-test-args=--generate-kubelet-config-file=true
     sigOwners: ['sig-node']
   ci-kubernetes-e2enode-ubuntudev2-k8sdev-serial:
     interval: 2h
     args:
     - --gcp-project=ubuntu-image-validation
-    - --node-test-args=--feature-gates=DynamicKubeletConfig=true,KubeletConfigFile=true --generate-kubelet-config-file=true
+    - --node-test-args=--feature-gates=DynamicKubeletConfig=true --generate-kubelet-config-file=true
     sigOwners: ['sig-node']
   ci-kubernetes-e2enode-ubuntudev2-k8sbeta-gkespec:
     interval: 2h
@@ -662,13 +662,13 @@ jobs:
     interval: 2h
     args:
     - --gcp-project=ubuntu-image-validation
-    - --node-test-args=--feature-gates=KubeletConfigFile=true --generate-kubelet-config-file=true
+    - --node-test-args=--generate-kubelet-config-file=true
     sigOwners: ['sig-node']
   ci-kubernetes-e2enode-ubuntustable1-k8sdev-serial:
     interval: 2h
     args:
     - --gcp-project=ubuntu-image-validation
-    - --node-test-args=--feature-gates=DynamicKubeletConfig=true,KubeletConfigFile=true --generate-kubelet-config-file=true
+    - --node-test-args=--feature-gates=DynamicKubeletConfig=true --generate-kubelet-config-file=true
     sigOwners: ['sig-node']
   ci-kubernetes-e2enode-ubuntustable1-k8sstable1-gkespec:
     interval: 2h
@@ -1043,7 +1043,6 @@ nodeTestSuites:
     args:
     - --timeout=70m
     - --test_args=--nodes=8 --skip="\[Flaky\]|\[Serial\]"
-    - --node-test-args=--feature-gates=KubeletConfigFile=true
   gkespec:
     args:
     - --node-args=--system-spec-name=gke
@@ -1053,4 +1052,4 @@ nodeTestSuites:
     args:
     - --timeout=180m
     - --test_args=--nodes=1 --focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]"
-    - --node-test-args=--feature-gates=DynamicKubeletConfig=true,KubeletConfigFile=true
+    - --node-test-args=--feature-gates=DynamicKubeletConfig=true