Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-1.15] Use Standard tier SKU for AKS e2e tests #4963

Merged
merged 1 commit into from
Jul 4, 2024
Merged

[release-1.15] Use Standard tier SKU for AKS e2e tests #4963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hack/util.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ capz::util::should_build_ccm() {

# all test regions must support AvailabilityZones
capz::util::get_random_region() {
local REGIONS=("canadacentral" "eastus" "eastus2" "northeurope" "uksouth" "westus2" "westus3")
local REGIONS=("canadacentral" "eastus" "eastus2" "northeurope" "uksouth" "westeurope" "westus2" "westus3")
echo "${REGIONS[${RANDOM} % ${#REGIONS[@]}]}"
}
# all regions below must have GPU availability for the chosen GPU VM SKU
Expand Down
3 changes: 3 additions & 0 deletions templates/test/ci/cluster-template-prow-aks-aso.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions templates/test/ci/cluster-template-prow-aks-clusterclass.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions templates/test/ci/cluster-template-prow-aks.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions templates/test/ci/prow-aks-aso/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ patches:
jobName: ${JOB_NAME}
creationTimestamp: ${TIMESTAMP}
buildProvenance: ${BUILD_PROVENANCE}
- op: replace
path: /spec/resources/0/spec/sku
value:
name: Base
tier: Standard
target:
kind: AzureASOManagedControlPlane
- patch: |-
Expand Down
1 change: 1 addition & 0 deletions templates/test/ci/prow-aks-clusterclass/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ patchesStrategicMerge:
- patches/addons.yaml
- patches/kubeadm-config-template.yaml
- patches.yaml
- patches/sku.yaml
10 changes: 10 additions & 0 deletions templates/test/ci/prow-aks-clusterclass/patches/sku.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: AzureManagedControlPlaneTemplate
metadata:
name: ${CLUSTER_NAME}-control-plane
namespace: default
spec:
template:
spec:
sku:
tier: Standard
3 changes: 2 additions & 1 deletion templates/test/ci/prow-aks/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ patchesStrategicMerge:
- ../patches/tags-aks.yaml
- patches/aks-pool0.yaml
- patches/aks-pool1.yaml
- patches/addons.yaml
- patches/addons.yaml
- patches/sku.yaml
8 changes: 8 additions & 0 deletions templates/test/ci/prow-aks/patches/sku.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: AzureManagedControlPlane
metadata:
name: ${CLUSTER_NAME}
namespace: default
spec:
sku:
tier: Standard