Skip to content

Commit 4a8e680

Browse files
committed
hack: enable assets.managed in the azure e2e jobs
Do not merge; drop before merging.
1 parent f76da87 commit 4a8e680

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

tests/e2e/kubetest2-kops/azure/zones.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
var allZones = []string{
2424
"uksouth-1",
2525
"uksouth-2",
26-
"uksouth-3",
26+
// uksouth-3 has no capacity for the tested VM sizes
2727
}
2828

2929
// RandomZones returns a random set of availability zones within a region

tests/e2e/kubetest2-kops/deployer/up.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,10 @@ func (d *deployer) createCluster(zones []string, adminAccess string, yes bool) e
266266
}
267267
case "azure":
268268
// Use SKUs for which there is enough quota
269-
args = appendIfUnset(args, "--control-plane-size", "Standard_D4ls_v6")
270-
args = appendIfUnset(args, "--node-size", "Standard_D4ls_v6")
269+
args = appendIfUnset(args, "--control-plane-size", "Standard_D4s_v3")
270+
args = appendIfUnset(args, "--node-size", "Standard_D4s_v3")
271+
// HACK: serve the cluster assets from a kOps-managed container registry
272+
args = append(args, "--set=spec.assets.managed=true")
271273
case "gce":
272274
if isArm {
273275
args = appendIfUnset(args, "--control-plane-size", "n4a-standard-2")

0 commit comments

Comments
 (0)