From 86e15dfcc91bfb1863917ffdd2bc7f7b94865a31 Mon Sep 17 00:00:00 2001
From: alejandrox1 <alarcj137@gmail.com>
Date: Fri, 22 May 2020 09:24:19 -0400
Subject: [PATCH] Modified node-kubelet-flaky job and image spec

This patch aims to enable the performance benchmarks in the
node-kubelet-flaky e2e job to run on an instance with enough cpu and
memory to run performance workloads.
It also explicitly specifies the `--server-start-timeout` flag to tell
the kubelet how long to wait for healthchecks in between restarts.

Signed-off-by: alejandrox1 <alarcj137@gmail.com>
---
 config/jobs/kubernetes/sig-node/node-kubelet.yaml |  4 ++--
 jobs/e2e_node/perf-image-config.yaml              | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 jobs/e2e_node/perf-image-config.yaml

diff --git a/config/jobs/kubernetes/sig-node/node-kubelet.yaml b/config/jobs/kubernetes/sig-node/node-kubelet.yaml
index ef4f2274a677..64a27c83b85f 100644
--- a/config/jobs/kubernetes/sig-node/node-kubelet.yaml
+++ b/config/jobs/kubernetes/sig-node/node-kubelet.yaml
@@ -177,8 +177,8 @@ periodics:
       - --deployment=node
       - --gcp-project-type=node-e2e-project
       - --gcp-zone=us-west1-b
-      - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config.yaml
-      - --node-test-args= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/"
+      - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/perf-image-config.yaml
+      - --node-test-args= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" --server-start-timeout=420s
       - --node-tests=true
       - --provider=gce
       - --test_args=--nodes=1 --focus="\[Flaky\]"
diff --git a/jobs/e2e_node/perf-image-config.yaml b/jobs/e2e_node/perf-image-config.yaml
new file mode 100644
index 000000000000..e721bffa814e
--- /dev/null
+++ b/jobs/e2e_node/perf-image-config.yaml
@@ -0,0 +1,15 @@
+---
+images:
+  cos-stable1:
+    image: cos-81-12871-119-0 # docker 19.03.6, current latest LTS.
+    project: cos-cloud
+    machine: n1-standard-16
+    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
+    tests:
+      - 'Node Performance Testing'
+  ubuntu:
+    image: ubuntu-gke-1804-1-17-v20200605 # docker 19.03.2 / containerd 1.2.10
+    project: ubuntu-os-gke-cloud
+    machine: n1-standard-16
+    tests:
+      - 'Node Performance Testing'