scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2026-01-08 16:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #118626 from borg-land/use-e2-instance-types

Browse Source 
Switch to e2 machine types
This commit is contained in:
Kubernetes Prow Robot
2024-01-04 16:49:14 +01:00
committed by GitHub
parent 692be54671 e2227a24fb
commit 88d497d401
6 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/e2e/autoscaling/cluster_size_autoscaling.go
View File

@@ -376,9 +376,9 @@ var _ = SIGDescribe("Cluster size autoscaling", framework.WithSlow(), func() {
f.It("should increase cluster size if pending pods are small and there is another node pool that is not autoscaled", feature.ClusterSizeAutoscalingScaleUp, func(ctx context.Context) {
e2eskipper.SkipUnlessProviderIs("gke")
ginkgo.By("Creating new node-pool with n1-standard-4 machines")
ginkgo.By("Creating new node-pool with e2-standard-4 machines")
const extraPoolName = "extra-pool"
addNodePool(extraPoolName, "n1-standard-4", 1)
addNodePool(extraPoolName, "e2-standard-4", 1)
defer deleteNodePool(extraPoolName)
extraNodes := getPoolInitialSize(extraPoolName)
framework.ExpectNoError(e2enode.WaitForReadyNodes(ctx, c, nodeCount+extraNodes, resizeTimeout))
@@ -410,9 +410,9 @@ var _ = SIGDescribe("Cluster size autoscaling", framework.WithSlow(), func() {
f.It("should disable node pool autoscaling", feature.ClusterSizeAutoscalingScaleUp, func(ctx context.Context) {
e2eskipper.SkipUnlessProviderIs("gke")
ginkgo.By("Creating new node-pool with n1-standard-4 machines")
ginkgo.By("Creating new node-pool with e2-standard-4 machines")
const extraPoolName = "extra-pool"
addNodePool(extraPoolName, "n1-standard-4", 1)
addNodePool(extraPoolName, "e2-standard-4", 1)
defer deleteNodePool(extraPoolName)
extraNodes := getPoolInitialSize(extraPoolName)
framework.ExpectNoError(e2enode.WaitForReadyNodes(ctx, c, nodeCount+extraNodes, resizeTimeout))
@@ -642,9 +642,9 @@ var _ = SIGDescribe("Cluster size autoscaling", framework.WithSlow(), func() {
f.It("should scale up correct target pool", feature.ClusterSizeAutoscalingScaleUp, func(ctx context.Context) {
e2eskipper.SkipUnlessProviderIs("gke")
ginkgo.By("Creating new node-pool with n1-standard-4 machines")
ginkgo.By("Creating new node-pool with e2-standard-4 machines")
const extraPoolName = "extra-pool"
addNodePool(extraPoolName, "n1-standard-4", 1)
addNodePool(extraPoolName, "e2-standard-4", 1)
defer deleteNodePool(extraPoolName)
extraNodes := getPoolInitialSize(extraPoolName)
framework.ExpectNoError(e2enode.WaitForReadyNodes(ctx, c, nodeCount+extraNodes, resizeTimeout))
@@ -698,7 +698,7 @@ var _ = SIGDescribe("Cluster size autoscaling", framework.WithSlow(), func() {
increasedSize := manuallyIncreaseClusterSize(ctx, f, originalSizes)
const extraPoolName = "extra-pool"
addNodePool(extraPoolName, "n1-standard-1", 3)
addNodePool(extraPoolName, "e2-standard-2", 3)
defer deleteNodePool(extraPoolName)
extraNodes := getPoolInitialSize(extraPoolName)
@@ -754,7 +754,7 @@ var _ = SIGDescribe("Cluster size autoscaling", framework.WithSlow(), func() {
// GKE-specific setup
ginkgo.By("Add a new node pool with 0 nodes and min size 0")
const extraPoolName = "extra-pool"
addNodePool(extraPoolName, "n1-standard-4", 0)
addNodePool(extraPoolName, "e2-standard-4", 0)
defer deleteNodePool(extraPoolName)
framework.ExpectNoError(enableAutoscaler(extraPoolName, 0, 1))
defer disableAutoscaler(extraPoolName, 0, 1)
@@ -814,7 +814,7 @@ var _ = SIGDescribe("Cluster size autoscaling", framework.WithSlow(), func() {
// GKE-specific setup
ginkgo.By("Add a new node pool with size 1 and min size 0")
const extraPoolName = "extra-pool"
addNodePool(extraPoolName, "n1-standard-4", 1)
addNodePool(extraPoolName, "e2-standard-4", 1)
defer deleteNodePool(extraPoolName)
extraNodes := getPoolInitialSize(extraPoolName)
framework.ExpectNoError(e2enode.WaitForReadyNodes(ctx, c, nodeCount+extraNodes, resizeTimeout))

4
test/e2e_node/remote/gce/gce_runner.go
View File

@@ -85,8 +85,8 @@ func init() {
}
const (
defaultGCEMachine = "n1-standard-1"
acceleratorTypeResourceFormat = "https://www.googleapis.com/compute/v1/projects/%s/zones/%s/acceleratorTypes/%s"
defaultGCEMachine = "e2-standard-2"
acceleratorTypeResourceFormat = "https://www.googleapis.com/compute/beta/projects/%s/zones/%s/acceleratorTypes/%s"
)
type GCERunner struct {