Skip to content

Commit 77cfeb6

Browse files
committed
Add custom K8s template for running clusterloader2 performance test
1 parent 00dfab1 commit 77cfeb6

File tree

8 files changed

+490
-18
lines changed

8 files changed

+490
-18
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ create-workload-cluster: $(ENVSUBST) $(KUBECTL) ## Create a workload cluster.
377377
timeout --foreground 1800 bash -c "while ! $(KUBECTL) get secrets -n default | grep $(CLUSTER_NAME)-kubeconfig; do sleep 1; done"
378378
# Get kubeconfig and store it locally.
379379
$(KUBECTL) get secret/$(CLUSTER_NAME)-kubeconfig -n default -o json | jq -r .data.value | base64 --decode > ./kubeconfig
380-
$(KUBECTL) -n default wait --for=condition=Ready --timeout=10m cluster "$(CLUSTER_NAME)"
380+
$(KUBECTL) -n default wait --for=condition=Ready --timeout=30m cluster "$(CLUSTER_NAME)"
381381

382382
@echo 'run "$(KUBECTL) --kubeconfig=./kubeconfig ..." to work with the new target cluster'
383383

scripts/aks-as-mgmt.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env bash
1+
1#!/usr/bin/env bash
22
# Copyright 2024 The Kubernetes Authors.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -260,4 +260,4 @@ rm -r combined_contexts.yaml
260260
rm -f tilt-settings-temp.yaml
261261
}
262262

263-
main
263+
main

templates/test/ci/cluster-template-prow-load.yaml renamed to templates/test/dev/cluster-template-custom-builds-load.yaml

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

templates/test/ci/prow-load/kustomization.yaml renamed to templates/test/dev/custom-builds-load/kustomization.yaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,21 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
namespace: default
44
resources:
5-
- ../prow
5+
- ../custom-builds
66
- storageclass-resource-set.yaml
77
patches:
88
- path: patches/cluster-label-storageclass.yaml
99
- path: patches/cluster-label-azuredisk.yaml
1010
- path: patches/kcp-scheduler.yaml
11-
configMapGenerator:
12-
- files:
13-
- storageclass=../../../addons/storageclass-azure-disk.yaml
14-
name: storageclass-${CLUSTER_NAME}
1511
generatorOptions:
1612
annotations:
1713
note: generated
1814
disableNameSuffixHash: true
1915
labels:
2016
type: generated
21-
17+
configMapGenerator:
18+
- files:
19+
- storageclass=../../../addons/storageclass-azure-disk.yaml
20+
name: ${CLUSTER_NAME}-storageclass
2221
sortOptions:
2322
order: fifo

templates/test/ci/prow-load/storageclass-resource-set.yaml renamed to templates/test/dev/custom-builds-load/storageclass-resource-set.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ spec:
1010
storageclass: "true"
1111
resources:
1212
- kind: ConfigMap
13-
name: cni-${CLUSTER_NAME}-storageclass
13+
name: ${CLUSTER_NAME}-storageclass
1414
strategy: ApplyOnce

0 commit comments

Comments
 (0)