From 79828817d20582a8fb92d9bfb0a3aa809c8f5fe4 Mon Sep 17 00:00:00 2001 From: Jon Huhn Date: Tue, 8 Jul 2025 21:26:13 -0500 Subject: [PATCH 1/7] i said there was nothing to see here From 3afc9ec302db60c4fd2ee8d995b3a0ed02004123 Mon Sep 17 00:00:00 2001 From: Jon Huhn Date: Fri, 11 Jul 2025 11:35:17 -0500 Subject: [PATCH 2/7] bump log verbosity --- .../test/dev/cluster-template-custom-builds-load-dra.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/test/dev/cluster-template-custom-builds-load-dra.yaml b/templates/test/dev/cluster-template-custom-builds-load-dra.yaml index 4d938ceb3be..b480c2aa6c0 100644 --- a/templates/test/dev/cluster-template-custom-builds-load-dra.yaml +++ b/templates/test/dev/cluster-template-custom-builds-load-dra.yaml @@ -73,7 +73,7 @@ spec: cloud-provider: external cluster-name: ${CLUSTER_NAME} feature-gates: DynamicResourceAllocation=true - v: "4" + v: "5" etcd: local: dataDir: /var/lib/etcddisk/etcd @@ -85,6 +85,7 @@ spec: authorization-always-allow-paths: /healthz,/readyz,/livez,/metrics bind-address: 0.0.0.0 feature-gates: DynamicResourceAllocation=true + v: "5" diskSetup: filesystems: - device: /dev/disk/azure/scsi1/lun0 From ef2f90cce717a48a7d43aba7ef3710e9164a5202 Mon Sep 17 00:00:00 2001 From: Jon Huhn Date: Fri, 11 Jul 2025 15:08:57 -0500 Subject: [PATCH 3/7] tweak verbosity --- .../test/dev/cluster-template-custom-builds-load-dra.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/test/dev/cluster-template-custom-builds-load-dra.yaml b/templates/test/dev/cluster-template-custom-builds-load-dra.yaml index b480c2aa6c0..842543171cc 100644 --- a/templates/test/dev/cluster-template-custom-builds-load-dra.yaml +++ b/templates/test/dev/cluster-template-custom-builds-load-dra.yaml @@ -73,7 +73,7 @@ spec: cloud-provider: external cluster-name: ${CLUSTER_NAME} feature-gates: DynamicResourceAllocation=true - v: "5" + v: "4" etcd: local: dataDir: /var/lib/etcddisk/etcd @@ -85,7 +85,7 @@ spec: authorization-always-allow-paths: /healthz,/readyz,/livez,/metrics bind-address: 0.0.0.0 feature-gates: DynamicResourceAllocation=true - v: "5" + v: "4" diskSetup: filesystems: - device: /dev/disk/azure/scsi1/lun0 From 2b59567e3f3b8891c564b164837fce7a93c3c881 Mon Sep 17 00:00:00 2001 From: Jon Huhn Date: Mon, 14 Jul 2025 23:28:36 -0500 Subject: [PATCH 4/7] pin k/k --- scripts/ci-entrypoint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci-entrypoint.sh b/scripts/ci-entrypoint.sh index 0d0cfc5ab00..048f457dc5c 100755 --- a/scripts/ci-entrypoint.sh +++ b/scripts/ci-entrypoint.sh @@ -77,6 +77,7 @@ setup() { if [[ "${KUBERNETES_VERSION:-}" =~ "latest" ]]; then CI_VERSION_URL="https://dl.k8s.io/ci/${KUBERNETES_VERSION}.txt" export CI_VERSION="${CI_VERSION:-$(curl --retry 3 -sSL "${CI_VERSION_URL}")}" + export CI_VERSION="v1.34.0-alpha.3.72+7a31dd60e5e2fa" fi if [[ -n "${CI_VERSION:-}" ]]; then echo "Using CI_VERSION ${CI_VERSION}" From 7ad40c383958ba733240445024b178adaf68489a Mon Sep 17 00:00:00 2001 From: Jon Huhn Date: Mon, 14 Jul 2025 23:31:09 -0500 Subject: [PATCH 5/7] tweak load test regions --- hack/util.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/util.sh b/hack/util.sh index 220b98611ce..e1674908d3b 100755 --- a/hack/util.sh +++ b/hack/util.sh @@ -78,7 +78,7 @@ capz::util::get_random_region_edgezone() { } # all regions below must have sufficient quota to run load tests capz::util::get_random_region_load() { - local REGIONS=("canadacentral" "francecentral" "northeurope") + local REGIONS=("uksouth" "australiaeast") echo "${REGIONS[${RANDOM} % ${#REGIONS[@]}]}" } From b6af279e7fe06b7d9bb1fb73d5be07277a42160a Mon Sep 17 00:00:00 2001 From: Jon Huhn Date: Tue, 15 Jul 2025 00:37:56 -0500 Subject: [PATCH 6/7] pin k/k for custom builds --- scripts/ci-build-kubernetes.sh | 2 ++ scripts/ci-entrypoint.sh | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/ci-build-kubernetes.sh b/scripts/ci-build-kubernetes.sh index c7d71c4339b..33b136a4d3f 100755 --- a/scripts/ci-build-kubernetes.sh +++ b/scripts/ci-build-kubernetes.sh @@ -46,6 +46,8 @@ setup() { KUBE_ROOT="$(go env GOPATH)/src/k8s.io/kubernetes" export KUBE_ROOT + git -C "${KUBE_ROOT}" checkout 7a31dd60e5e2fa7a10771d4f058cc3a2e2b027b5 + # shellcheck disable=SC1091 # extract KUBE_GIT_VERSION from k/k # ref: https://github.com/kubernetes/test-infra/blob/de07aa4b89f1161778856dc0fed310bd816aad72/experiment/kind-conformance-image-e2e.sh#L112-L115 diff --git a/scripts/ci-entrypoint.sh b/scripts/ci-entrypoint.sh index d193d80c79c..43b95dfa885 100755 --- a/scripts/ci-entrypoint.sh +++ b/scripts/ci-entrypoint.sh @@ -77,7 +77,6 @@ setup() { if [[ "${KUBERNETES_VERSION:-}" =~ "latest" ]]; then CI_VERSION_URL="https://dl.k8s.io/ci/${KUBERNETES_VERSION}.txt" export CI_VERSION="${CI_VERSION:-$(curl --retry 3 -sSL "${CI_VERSION_URL}")}" - export CI_VERSION="v1.34.0-alpha.3.72+7a31dd60e5e2fa" fi if [[ -n "${CI_VERSION:-}" ]]; then echo "Using CI_VERSION ${CI_VERSION}" From 12929f9807c42d4c0985144c8876b0a519df0980 Mon Sep 17 00:00:00 2001 From: Jon Huhn Date: Tue, 15 Jul 2025 15:35:02 -0500 Subject: [PATCH 7/7] Revert "pin k/k for custom builds" This reverts commit b6af279e7fe06b7d9bb1fb73d5be07277a42160a. --- scripts/ci-build-kubernetes.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/ci-build-kubernetes.sh b/scripts/ci-build-kubernetes.sh index 33b136a4d3f..c7d71c4339b 100755 --- a/scripts/ci-build-kubernetes.sh +++ b/scripts/ci-build-kubernetes.sh @@ -46,8 +46,6 @@ setup() { KUBE_ROOT="$(go env GOPATH)/src/k8s.io/kubernetes" export KUBE_ROOT - git -C "${KUBE_ROOT}" checkout 7a31dd60e5e2fa7a10771d4f058cc3a2e2b027b5 - # shellcheck disable=SC1091 # extract KUBE_GIT_VERSION from k/k # ref: https://github.com/kubernetes/test-infra/blob/de07aa4b89f1161778856dc0fed310bd816aad72/experiment/kind-conformance-image-e2e.sh#L112-L115