Skip to content

Commit 12e1c11

Browse files
committed
Add separate MachineDeployment for Prometheus in load tests
1 parent 4dc9ba4 commit 12e1c11

File tree

5 files changed

+419
-2
lines changed

5 files changed

+419
-2
lines changed

scripts/ci-entrypoint.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ setup() {
113113
export CONTROL_PLANE_MACHINE_COUNT="${CONTROL_PLANE_MACHINE_COUNT:-1}"
114114
export CCM_COUNT="${CCM_COUNT:-1}"
115115
export WORKER_MACHINE_COUNT="${WORKER_MACHINE_COUNT:-2}"
116+
export MONITORING_MACHINE_COUNT="${MONITORING_MACHINE_COUNT:-0}"
116117
export EXP_CLUSTER_RESOURCE_SET="true"
117118

118119
# TODO figure out a better way to account for expected Windows node count
@@ -180,10 +181,10 @@ wait_for_copy_kubeadm_config_map() {
180181

181182
# wait_for_nodes returns when all nodes in the workload cluster are Ready.
182183
wait_for_nodes() {
183-
echo "Waiting for ${CONTROL_PLANE_MACHINE_COUNT} control plane machine(s), ${WORKER_MACHINE_COUNT} worker machine(s), and ${WINDOWS_WORKER_MACHINE_COUNT:-0} windows machine(s) to become Ready"
184+
echo "Waiting for ${CONTROL_PLANE_MACHINE_COUNT} control plane machine(s), ${WORKER_MACHINE_COUNT} worker machine(s), ${WINDOWS_WORKER_MACHINE_COUNT:-0} windows machine(s), and ${MONITORING_MACHINE_COUNT} monitoring machine(s) to become Ready"
184185

185186
# Ensure that all nodes are registered with the API server before checking for readiness
186-
local total_nodes="$((CONTROL_PLANE_MACHINE_COUNT + WORKER_MACHINE_COUNT + WINDOWS_WORKER_MACHINE_COUNT))"
187+
local total_nodes="$((CONTROL_PLANE_MACHINE_COUNT + WORKER_MACHINE_COUNT + WINDOWS_WORKER_MACHINE_COUNT + MONITORING_MACHINE_COUNT))"
187188
while [[ $("${KUBECTL}" get nodes -ojson | jq '.items | length') -ne "${total_nodes}" ]]; do
188189
sleep 10
189190
done

templates/test/dev/cluster-template-custom-builds-load-dra.yaml

Lines changed: 146 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/dev/cluster-template-custom-builds-load.yaml

Lines changed: 135 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/dev/custom-builds-load/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ kind: Kustomization
33
namespace: default
44
resources:
55
- ../custom-builds
6+
- machinedeployment-monitoring.yaml
67
- storageclass-resource-set.yaml
78
patches:
89
- path: patches/cluster-label-storageclass.yaml

0 commit comments

Comments
 (0)