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

Commit b8b29d5

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

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@ if [[ "${CLOUD_PROVIDER}" == "aws" ]]; then
2727
elif [[ "${CLOUD_PROVIDER}" == "gce" ]]; then
2828
kops create instancegroup addons --edit=false --role node --zone us-east1-b
2929
kops edit instancegroup addons --set=spec.machineType="${ADDONS_NODE_SIZE:-c3-standard-22}" \
30-
--set=spec.maxSize=1 --set=spec.minSize=1 \
30+
--set=spec.maxSize=1 --set=spec.minSize=1 --set=spec.rootVolume.type=hyperdisk-balanced \
3131
--set=spec.image="${INSTANCE_IMAGE:-ubuntu-os-cloud/ubuntu-2404-noble-amd64-v20251001}"
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)