From e6cbc98de6f73b679f67376cc97c956c7aa1d72b Mon Sep 17 00:00:00 2001
From: Michael Taufen <mtaufen@google.com>
Date: Fri, 26 Jan 2018 18:05:18 -0800
Subject: [PATCH] Stop setting KubeletConfigFile

This feature gate is now a noop, and is no longer necessary to set.
See: https://github.com/kubernetes/kubernetes/pull/58760
---
 experiment/test_config.yaml | 23 ++++++++--------
 jobs/config.json            | 54 ++++++++++++++++---------------------
 2 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/experiment/test_config.yaml b/experiment/test_config.yaml
index 902bdbf188a0..f9c61ce9ebba 100644
--- 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
diff --git a/jobs/config.json b/jobs/config.json
index 8de09b22fe6a..7e8f2edd8ef8 100644
--- a/jobs/config.json
+++ b/jobs/config.json
@@ -9541,7 +9541,6 @@
       "--gcp-project=cos-image-validation",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=cos-stable-63-10032-71-0-p --image-project=gke-node-images --instance-metadata=user-data<test/e2e_node/jenkins/cos-init-disable-live-restore.yaml,gci-update-strategy=update_disabled",
-      "--node-test-args=--feature-gates=KubeletConfigFile=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=8 --skip=\"\\[Flaky\\]|\\[Serial\\]\"",
@@ -9562,7 +9561,7 @@
       "--gcp-project=cos-image-validation",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=cos-stable-63-10032-71-0-p --image-project=gke-node-images --instance-metadata=user-data<test/e2e_node/jenkins/cos-init-disable-live-restore.yaml,gci-update-strategy=update_disabled",
-      "--node-test-args=--feature-gates=DynamicKubeletConfig=true,KubeletConfigFile=true",
+      "--node-test-args=--feature-gates=DynamicKubeletConfig=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=1 --focus=\"\\[Serial\\]\" --skip=\"\\[Flaky\\]|\\[Benchmark\\]\"",
@@ -9583,7 +9582,7 @@
       "--gcp-project=cos-image-validation",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=cos-stable-63-10032-71-0-p --image-project=gke-node-images --instance-metadata=user-data<test/e2e_node/jenkins/cos-init-disable-live-restore.yaml,gci-update-strategy=update_disabled",
-      "--node-test-args=--feature-gates=KubeletConfigFile=true --generate-kubelet-config-file=true",
+      "--node-test-args=--generate-kubelet-config-file=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=8 --skip=\"\\[Flaky\\]|\\[Serial\\]\"",
@@ -9604,7 +9603,7 @@
       "--gcp-project=cos-image-validation",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=cos-stable-63-10032-71-0-p --image-project=gke-node-images --instance-metadata=user-data<test/e2e_node/jenkins/cos-init-disable-live-restore.yaml,gci-update-strategy=update_disabled",
-      "--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",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=1 --focus=\"\\[Serial\\]\" --skip=\"\\[Flaky\\]|\\[Benchmark\\]\"",
@@ -9625,7 +9624,6 @@
       "--gcp-project=cos-image-validation",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=cos-stable-63-10032-71-0-p --image-project=gke-node-images --instance-metadata=user-data<test/e2e_node/jenkins/cos-init-disable-live-restore.yaml,gci-update-strategy=update_disabled",
-      "--node-test-args=--feature-gates=KubeletConfigFile=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=8 --skip=\"\\[Flaky\\]|\\[Serial\\]\"",
@@ -9646,7 +9644,7 @@
       "--gcp-project=cos-image-validation",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=cos-stable-63-10032-71-0-p --image-project=gke-node-images --instance-metadata=user-data<test/e2e_node/jenkins/cos-init-disable-live-restore.yaml,gci-update-strategy=update_disabled",
-      "--node-test-args=--feature-gates=DynamicKubeletConfig=true,KubeletConfigFile=true",
+      "--node-test-args=--feature-gates=DynamicKubeletConfig=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=1 --focus=\"\\[Serial\\]\" --skip=\"\\[Flaky\\]|\\[Benchmark\\]\"",
@@ -9667,7 +9665,6 @@
       "--gcp-project=cos-image-validation",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=cos-stable-63-10032-71-0-p --image-project=gke-node-images --instance-metadata=user-data<test/e2e_node/jenkins/cos-init-disable-live-restore.yaml,gci-update-strategy=update_disabled",
-      "--node-test-args=--feature-gates=KubeletConfigFile=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=8 --skip=\"\\[Flaky\\]|\\[Serial\\]\"",
@@ -9688,7 +9685,7 @@
       "--gcp-project=cos-image-validation",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=cos-stable-63-10032-71-0-p --image-project=gke-node-images --instance-metadata=user-data<test/e2e_node/jenkins/cos-init-disable-live-restore.yaml,gci-update-strategy=update_disabled",
-      "--node-test-args=--feature-gates=DynamicKubeletConfig=true,KubeletConfigFile=true",
+      "--node-test-args=--feature-gates=DynamicKubeletConfig=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=1 --focus=\"\\[Serial\\]\" --skip=\"\\[Flaky\\]|\\[Benchmark\\]\"",
@@ -9709,7 +9706,6 @@
       "--gcp-project=cos-image-validation",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=cos-stable-63-10032-71-0-p --image-project=gke-node-images --instance-metadata=user-data<test/e2e_node/jenkins/cos-init-disable-live-restore.yaml,gci-update-strategy=update_disabled",
-      "--node-test-args=--feature-gates=KubeletConfigFile=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=8 --skip=\"\\[Flaky\\]|\\[Serial\\]\"",
@@ -9730,7 +9726,7 @@
       "--gcp-project=cos-image-validation",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=cos-stable-63-10032-71-0-p --image-project=gke-node-images --instance-metadata=user-data<test/e2e_node/jenkins/cos-init-disable-live-restore.yaml,gci-update-strategy=update_disabled",
-      "--node-test-args=--feature-gates=DynamicKubeletConfig=true,KubeletConfigFile=true",
+      "--node-test-args=--feature-gates=DynamicKubeletConfig=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=1 --focus=\"\\[Serial\\]\" --skip=\"\\[Flaky\\]|\\[Benchmark\\]\"",
@@ -9751,7 +9747,6 @@
       "--gcp-project=k8s-test-f1ca4a9c02",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=cos-stable-63-10032-71-0 --image-project=cos-cloud --instance-metadata=user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled",
-      "--node-test-args=--feature-gates=KubeletConfigFile=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=8 --skip=\"\\[Flaky\\]|\\[Serial\\]\"",
@@ -9772,7 +9767,7 @@
       "--gcp-project=k8s-test-1d6ad79530",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=cos-stable-63-10032-71-0 --image-project=cos-cloud --instance-metadata=user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled",
-      "--node-test-args=--feature-gates=DynamicKubeletConfig=true,KubeletConfigFile=true",
+      "--node-test-args=--feature-gates=DynamicKubeletConfig=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=1 --focus=\"\\[Serial\\]\" --skip=\"\\[Flaky\\]|\\[Benchmark\\]\"",
@@ -9793,7 +9788,7 @@
       "--gcp-project=k8s-test-63a7f7788a",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=cos-stable-63-10032-71-0 --image-project=cos-cloud --instance-metadata=user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled",
-      "--node-test-args=--feature-gates=KubeletConfigFile=true --generate-kubelet-config-file=true",
+      "--node-test-args=--generate-kubelet-config-file=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=8 --skip=\"\\[Flaky\\]|\\[Serial\\]\"",
@@ -9814,7 +9809,7 @@
       "--gcp-project=k8s-test-39a894cbd4",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=cos-stable-63-10032-71-0 --image-project=cos-cloud --instance-metadata=user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled",
-      "--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",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=1 --focus=\"\\[Serial\\]\" --skip=\"\\[Flaky\\]|\\[Benchmark\\]\"",
@@ -9835,7 +9830,6 @@
       "--gcp-project=k8s-test-7714104ae1",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=cos-stable-63-10032-71-0 --image-project=cos-cloud --instance-metadata=user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled",
-      "--node-test-args=--feature-gates=KubeletConfigFile=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=8 --skip=\"\\[Flaky\\]|\\[Serial\\]\"",
@@ -9856,7 +9850,7 @@
       "--gcp-project=k8s-test-27d359e3d6",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=cos-stable-63-10032-71-0 --image-project=cos-cloud --instance-metadata=user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled",
-      "--node-test-args=--feature-gates=DynamicKubeletConfig=true,KubeletConfigFile=true",
+      "--node-test-args=--feature-gates=DynamicKubeletConfig=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=1 --focus=\"\\[Serial\\]\" --skip=\"\\[Flaky\\]|\\[Benchmark\\]\"",
@@ -9877,7 +9871,6 @@
       "--gcp-project=k8s-test-9f6500beee",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=cos-stable-63-10032-71-0 --image-project=cos-cloud --instance-metadata=user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled",
-      "--node-test-args=--feature-gates=KubeletConfigFile=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=8 --skip=\"\\[Flaky\\]|\\[Serial\\]\"",
@@ -9898,7 +9891,7 @@
       "--gcp-project=k8s-test-5f678591cd",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=cos-stable-63-10032-71-0 --image-project=cos-cloud --instance-metadata=user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled",
-      "--node-test-args=--feature-gates=DynamicKubeletConfig=true,KubeletConfigFile=true",
+      "--node-test-args=--feature-gates=DynamicKubeletConfig=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=1 --focus=\"\\[Serial\\]\" --skip=\"\\[Flaky\\]|\\[Benchmark\\]\"",
@@ -9919,7 +9912,6 @@
       "--gcp-project=k8s-test-1cee98f86d",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=cos-stable-63-10032-71-0 --image-project=cos-cloud --instance-metadata=user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled",
-      "--node-test-args=--feature-gates=KubeletConfigFile=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=8 --skip=\"\\[Flaky\\]|\\[Serial\\]\"",
@@ -9940,7 +9932,7 @@
       "--gcp-project=k8s-test-592642f0ef",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=cos-stable-63-10032-71-0 --image-project=cos-cloud --instance-metadata=user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled",
-      "--node-test-args=--feature-gates=DynamicKubeletConfig=true,KubeletConfigFile=true",
+      "--node-test-args=--feature-gates=DynamicKubeletConfig=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=1 --focus=\"\\[Serial\\]\" --skip=\"\\[Flaky\\]|\\[Benchmark\\]\"",
@@ -9961,7 +9953,7 @@
       "--gcp-project=ubuntu-image-validation",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=ubuntu-gke-1604-xenial-v20180122 --image-project=ubuntu-os-gke-cloud-devel --system-spec-name=gke",
-      "--node-test-args=--feature-gates=KubeletConfigFile=true --generate-kubelet-config-file=true",
+      "--node-test-args=--generate-kubelet-config-file=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=8 --skip=\"\\[Flaky\\]|\\[Serial\\]\"",
@@ -9982,7 +9974,7 @@
       "--gcp-project=ubuntu-image-validation",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=ubuntu-gke-1604-xenial-v20180122 --image-project=ubuntu-os-gke-cloud-devel",
-      "--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",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=1 --focus=\"\\[Serial\\]\" --skip=\"\\[Flaky\\]|\\[Benchmark\\]\"",
@@ -10023,7 +10015,7 @@
       "--gcp-project=ubuntu-image-validation",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=ubuntu-gke-1604-xenial-v20180122 --image-project=ubuntu-os-gke-cloud-devel",
-      "--node-test-args=--feature-gates=DynamicKubeletConfig=true,KubeletConfigFile=true",
+      "--node-test-args=--feature-gates=DynamicKubeletConfig=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=1 --focus=\"\\[Serial\\]\" --skip=\"\\[Flaky\\]|\\[Benchmark\\]\"",
@@ -10064,7 +10056,7 @@
       "--gcp-project=ubuntu-image-validation",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=ubuntu-gke-1604-xenial-v20180122 --image-project=ubuntu-os-gke-cloud-devel",
-      "--node-test-args=--feature-gates=DynamicKubeletConfig=true,KubeletConfigFile=true",
+      "--node-test-args=--feature-gates=DynamicKubeletConfig=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=1 --focus=\"\\[Serial\\]\" --skip=\"\\[Flaky\\]|\\[Benchmark\\]\"",
@@ -10105,7 +10097,7 @@
       "--gcp-project=ubuntu-image-validation",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=ubuntu-gke-1604-xenial-v20180122-1 --image-project=ubuntu-os-gke-cloud-devel",
-      "--node-test-args=--feature-gates=DynamicKubeletConfig=true,KubeletConfigFile=true",
+      "--node-test-args=--feature-gates=DynamicKubeletConfig=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=1 --focus=\"\\[Serial\\]\" --skip=\"\\[Flaky\\]|\\[Benchmark\\]\"",
@@ -10126,7 +10118,7 @@
       "--gcp-project=ubuntu-image-validation",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=ubuntu-gke-1604-xenial-v20180122-1 --image-project=ubuntu-os-gke-cloud-devel --system-spec-name=gke",
-      "--node-test-args=--feature-gates=KubeletConfigFile=true --generate-kubelet-config-file=true",
+      "--node-test-args=--generate-kubelet-config-file=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=8 --skip=\"\\[Flaky\\]|\\[Serial\\]\"",
@@ -10147,7 +10139,7 @@
       "--gcp-project=ubuntu-image-validation",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=ubuntu-gke-1604-xenial-v20180122-1 --image-project=ubuntu-os-gke-cloud-devel",
-      "--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",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=1 --focus=\"\\[Serial\\]\" --skip=\"\\[Flaky\\]|\\[Benchmark\\]\"",
@@ -10168,7 +10160,7 @@
       "--gcp-project=ubuntu-image-validation",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=ubuntu-gke-1604-xenial-v20170816-1 --image-project=ubuntu-os-gke-cloud --system-spec-name=gke",
-      "--node-test-args=--feature-gates=KubeletConfigFile=true --generate-kubelet-config-file=true",
+      "--node-test-args=--generate-kubelet-config-file=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=8 --skip=\"\\[Flaky\\]|\\[Serial\\]\"",
@@ -10189,7 +10181,7 @@
       "--gcp-project=ubuntu-image-validation",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=ubuntu-gke-1604-xenial-v20170816-1 --image-project=ubuntu-os-gke-cloud",
-      "--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",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=1 --focus=\"\\[Serial\\]\" --skip=\"\\[Flaky\\]|\\[Benchmark\\]\"",
@@ -10230,7 +10222,7 @@
       "--gcp-project=ubuntu-image-validation",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=ubuntu-gke-1604-xenial-v20170816-1 --image-project=ubuntu-os-gke-cloud",
-      "--node-test-args=--feature-gates=DynamicKubeletConfig=true,KubeletConfigFile=true",
+      "--node-test-args=--feature-gates=DynamicKubeletConfig=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=1 --focus=\"\\[Serial\\]\" --skip=\"\\[Flaky\\]|\\[Benchmark\\]\"",
@@ -10271,7 +10263,7 @@
       "--gcp-project=ubuntu-image-validation",
       "--gcp-zone=us-central1-f",
       "--node-args=--images=ubuntu-gke-1604-xenial-v20170816-1 --image-project=ubuntu-os-gke-cloud",
-      "--node-test-args=--feature-gates=DynamicKubeletConfig=true,KubeletConfigFile=true",
+      "--node-test-args=--feature-gates=DynamicKubeletConfig=true",
       "--node-tests=true",
       "--provider=gce",
       "--test_args=--nodes=1 --focus=\"\\[Serial\\]\" --skip=\"\\[Flaky\\]|\\[Benchmark\\]\"",