From 110f9e1e2369416902b52ed443ee649df24b5f6d Mon Sep 17 00:00:00 2001
From: upodroid <upodroid@users.noreply.github.com>
Date: Thu, 28 Dec 2023 12:27:04 +0000
Subject: [PATCH] add some debugging things

---
 tests/e2e/kubetest2-kops/deployer/common.go |  2 ++
 tests/e2e/scenarios/scalability/run-test.sh | 17 +++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/tests/e2e/kubetest2-kops/deployer/common.go b/tests/e2e/kubetest2-kops/deployer/common.go
index 1ee69ab37c434..aced1525a31b8 100644
--- a/tests/e2e/kubetest2-kops/deployer/common.go
+++ b/tests/e2e/kubetest2-kops/deployer/common.go
@@ -100,6 +100,8 @@ func (d *deployer) initialize() error {
 				d.SSHPublicKeyPath = publicKey
 			}
 			d.createBucket = true
+		} else if d.SSHPrivateKeyPath == "" && os.Getenv("KUBE_SSH_KEY_PATH") != "" {
+			d.SSHPublicKeyPath = os.Getenv("KUBE_SSH_KEY_PATH")
 		}
 	}
 
diff --git a/tests/e2e/scenarios/scalability/run-test.sh b/tests/e2e/scenarios/scalability/run-test.sh
index fc3c5890c15e2..725a43ecdfbf9 100755
--- a/tests/e2e/scenarios/scalability/run-test.sh
+++ b/tests/e2e/scenarios/scalability/run-test.sh
@@ -36,6 +36,13 @@ git -C "${GOPATH}"/src/k8s.io/perf-tests fetch dev-fork
 git -C "${GOPATH}"/src/k8s.io/perf-tests checkout --track dev-fork/kops-scale-dev
 # view diff at https://github.com/kubernetes/perf-tests/compare/master...borg-land:perf-tests:kops-scale-dev?expand=1
 
+# A temp patch for kubetest2 https://github.com/kubernetes-sigs/kubetest2/pull/256
+git clone https://github.com/borg-land/kubetest2.git /tmp/kubetest2
+pushd /tmp/kubetest2
+git checkout extra-cl2-args
+make install-all
+popd 
+
 # Default cloud provider to aws
 if [[ -z "${CLOUD_PROVIDER:-}" ]]; then
   CLOUD_PROVIDER="aws"
@@ -103,6 +110,7 @@ create_args+=("--set spec.kubeAPIServer.maxRequestsInflight=800")
 create_args+=("--set spec.kubeAPIServer.maxMutatingRequestsInflight=400")
 create_args+=("--set spec.kubeAPIServer.enableProfiling=true")
 create_args+=("--set spec.kubeAPIServer.enableContentionProfiling=true")
+create_args+=("--set spec.kubeAPIServer.logLevel=4")
 # this is required for Prometheus server to scrape metrics endpoint on APIServer
 create_args+=("--set spec.kubeAPIServer.anonymousAuth=true")
 # this is required for prometheus to scrape kube-proxy metrics endpoint
@@ -133,14 +141,6 @@ if [[ "${CLOUD_PROVIDER}" == "gce" ]]; then
   KUBETEST2_ARGS+=("--stage-location=gs://k8s-infra-e2e-scale-project-stage")
   KUBETEST2_ARGS+=("--control-plane-instance-group-overrides=spec.rootVolume.type=pd-ssd")
   create_args+=("--set=spec.kubeDNS.provider=KubeDNS")
-  # print ssh key pairs
-  gcloud compute project-info describe \
-    --format="value(commonInstanceMetadata[items][ssh-keys])" \
-    --project=k8s-infra-e2e-scale-project
-  cat /etc/ssh-key-secret/ssh-public
-  mkdir -p "/tmp/kops/${CLUSTER_NAME}"
-  cp /etc/ssh-key-secret/ssh-private "/tmp/kops/${CLUSTER_NAME}/id_rsa"
-  export KUBE_SSH_KEY_PATH="/tmp/kops/${CLUSTER_NAME}/id_rsa"
 fi
 
 # More time for bigger clusters
@@ -192,6 +192,7 @@ kubetest2 kops "${KUBETEST2_ARGS[@]}" \
   --repo-root="${GOPATH}"/src/k8s.io/perf-tests \
   --test-configs="${GOPATH}"/src/k8s.io/perf-tests/clusterloader2/testing/load/config.yaml \
   --test-overrides="${GOPATH}"/src/k8s.io/perf-tests/clusterloader2/testing/load/overrides.yaml \
+  --extra-cl2-args="--experimental-prometheus-snapshot-to-report-dir=true" \
   --kube-config="${HOME}/.kube/config"
   # --test-overrides="${GOPATH}"/src/k8s.io/perf-tests/clusterloader2/testing/experiments/enable_restart_count_check.yaml \
   # --test-overrides="${GOPATH}"/src/k8s.io/perf-tests/clusterloader2/testing/experiments/ignore_known_gce_container_restarts.yaml \