Sitelet https://github.com/kubernetes/kops/commit/cfc2596e316e574d25d92e7e53f4119d47bf284f
Skip to content

Commit cfc2596

Browse files
serathiusserathius
committed
Move Prometheus to addon nodes
1 parent 3df8618 commit cfc2596

2 files changed

Lines changed: 1 addition & 3 deletions

File tree

‎tests/e2e/scenarios/scalability/pre-test.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,4 @@ elif [[ "${CLOUD_PROVIDER}" == "gce" ]]; then
3232
fi
3333

3434
kops update cluster --yes
35-
sleep 120 # it shouldn't take long to have the node up and ready
36-
# TODO: replace with kops validate instancegroup instead of the wait
35+
kops validate cluster --wait 10m

‎tests/e2e/scenarios/scalability/run-test.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ fi
189189
# used by CL2 Prometheus here https://github.com/kubernetes/perf-tests/blob/master/clusterloader2/pkg/prometheus/manifests/default/kube-proxy-service.yaml#L2
190190
export PROMETHEUS_KUBE_PROXY_SELECTOR_KEY="k8s-app"
191191
export PROMETHEUS_SCRAPE_APISERVER_ONLY="true"
192-
export CL2_PROMETHEUS_TOLERATE_MASTER="true"
193192
export ETCD_PORT="4001" # we want cl2 to use this port for etcd instead of 2379
194193
if [[ "${CLOUD_PROVIDER}" == "aws" && "${SCALE_SCENARIO}" == "performance" ]]; then
195194
# CL2 uses KUBE_SSH_KEY_PATH path to ssh to instances for scraping metrics

0 commit comments

Comments
 (0)